Merge pull request #149 from XYOracleNetwork/release

Release
XYOracleNetwork-v1 · May 7, 2020 · b62e88e · b62e88e
2 parents 3757931 + 0d5cd98
commit b62e88e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"

diff --git a/xyo-android-library/src/main/java/network/xyo/sdk/bluetooth/client/XyoBluetoothClient.kt b/xyo-android-library/src/main/java/network/xyo/sdk/bluetooth/client/XyoBluetoothClient.kt
@@ -260,7 +260,6 @@ open class XyoBluetoothClient : XYIBeaconBluetoothDevice {
                     } else {
                         log.info("Not an Xyo Device - Not Creating: $hash")
 
-                        /*
                         val createdDevice = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                             XyoBluetoothClient(context, scanResult, hash, BluetoothDevice.TRANSPORT_LE)
                         } else {
@@ -269,11 +268,9 @@ open class XyoBluetoothClient : XYIBeaconBluetoothDevice {
 
                         foundDevices[hash] = createdDevice
                         globalDevices[hash] = createdDevice
-                         */
                     }
                 }
             }
-
         }
     }
 }
diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties
@@ -1,2 +1,2 @@
-#Fri Apr 24 19:58:30 UTC 2020
-VERSION_PATCH=35
+#Thu May 07 04:42:24 UTC 2020
+VERSION_PATCH=36
diff --git a/xyo-android-sample/src/main/AndroidManifest.xml b/xyo-android-sample/src/main/AndroidManifest.xml
@@ -2,9 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="network.xyo.sdk.sample">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:allowBackup="true"