Merge pull request #84 from XYOracleNetwork/release

Release - settings update for Android 10
XYOracleNetwork · Jul 17, 2020 · 346d7d7 · 346d7d7
2 parents 605581d + c2108d5
commit 346d7d7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/prepRelease.yml b/.github/workflows/prepRelease.yml
@@ -13,6 +13,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: pre-build
       run:  chmod +x ./gradlew
+    - name: clean
+      run: ./gradlew :ble-android-library:clean
     - name: build
       run: ./gradlew :ble-android-library:assemble
     - name: check in local changes

diff --git a/ble-android-library/src/main/AndroidManifest.xml b/ble-android-library/src/main/AndroidManifest.xml
@@ -6,5 +6,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:required="true" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
 </manifest>
diff --git a/ble-android-library/src/main/kotlin/network/xyo/ble/generic/scanner/XYSmartScanModern.kt b/ble-android-library/src/main/kotlin/network/xyo/ble/generic/scanner/XYSmartScanModern.kt
@@ -112,6 +112,9 @@ class XYSmartScanModern(context: Context) : XYSmartScan(context) {
     private fun getSettings(): ScanSettings {
         var result: ScanSettings? = null
         XYCallByVersion()
+                .add(Build.VERSION_CODES.Q) {
+                    result = getSettings29()
+                }
                 .add(Build.VERSION_CODES.O) {
                     result = getSettings26()
                 }
@@ -152,6 +155,16 @@ class XYSmartScanModern(context: Context) : XYSmartScan(context) {
                 .build()
     }
 
+    // Android 10
+    @TargetApi(Build.VERSION_CODES.Q)
+    private fun getSettings29(): ScanSettings {
+        return ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_BALANCED)
+                .setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+                .setMatchMode(ScanSettings.MATCH_MODE_STICKY)
+                .build()
+    }
+
     override suspend fun stop() = GlobalScope.async {
         log.info("stop")
         super.stop()

diff --git a/ble-android-library/version.properties b/ble-android-library/version.properties
@@ -1,2 +1,2 @@
-#Tue Apr 14 01:46:44 UTC 2020
-VERSION_PATCH=1145
+#Fri Jul 17 21:53:23 UTC 2020
+VERSION_PATCH=1146
diff --git a/ble-android-sample/build.gradle b/ble-android-sample/build.gradle
@@ -58,7 +58,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
     }
 }

diff --git a/ble-android-sample/gradle/wrapper/gradle-wrapper.properties b/ble-android-sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 13 18:33:18 PDT 2020
+#Fri Jul 10 12:19:28 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip