Merge remote-tracking branch 'origin/master'

SleepGarmin-android/app/build.gradle

@@ -32,7 +32,7 @@ android {
         applicationId "com.urbandroid.sleep.garmin"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 12
+        versionCode 13
         versionName "20180927"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

SleepGarmin-android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.INTERNET"/>           <!-- Added so ADB works with garmin simulation-->
+    <!--<uses-permission android:name="android.permission.INTERNET"/>           &lt;!&ndash; Added so ADB works with garmin simulation&ndash;&gt;-->
 
     <application
         android:allowBackup="true"

SleepGarmin-android/gradle.properties

@@ -1,24 +1,10 @@
-# Project-wide Gradle settings.
+projectGroup=com.urbandroid.sleep
+projectName=garmin
+projectVersion=1.0
 
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 
-projectKeystoreFile=/home/artaud/.android/debug.keystore
-projectKeystoreAlias=androiddebugkey
-projectKeystorePassword=android
+org.gradle.jvmargs=-Xms512m -Xmx2048m -XX:MaxPermSize=512m