diff --git a/app/build.gradle b/app/build.gradle index 97d15767..e362bb00 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 18 targetSdkVersion 25 - versionCode 56 - versionName "2.2.1" + versionCode 57 + versionName "2.2.2" } buildTypes { release { @@ -19,8 +19,8 @@ android { } productFlavors { fastBuild { - // Switching the flavor to fastBuild accelerates te build speed (works only with Android 5+ devices) - minSdkVersion 21 + // Switching the flavor to fastBuild accelerates te build speed (works only with Android 7+ devices) + minSdkVersion 25 versionName "Instant Run" } releaseBuild { @@ -31,7 +31,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.android.gms:play-services-wearable:9.2.0' compile 'com.android.support:appcompat-v7:25.0.1' compile 'com.android.support:design:25.0.1' compile 'no.nordicsemi.android.support.v18:scanner:1.0.0' @@ -42,10 +41,12 @@ dependencies { } compile files('libs/achartengine-1.1.0.jar') compile project(':common') - wearApp project(':wear') + wearApp project(path: ':wear', configuration: 'wear1Release') + // nRF Toolbox is using Play Service 7.8.87 in order to make the app working in China: + // https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK + compile 'com.google.android.gms:play-services-wearable:7.8.87' // The DFU Library is imported automatically from jcenter. - compile 'no.nordicsemi.android:dfu:1.1.1' compile 'no.nordicsemi.android:dfu:1.2.0' // If you want to make some changes in the DFU Library, clone the https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder, // add it as a module in Project Structure and uncomment the following line: diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java index f78064dd..652670d2 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java @@ -183,6 +183,10 @@ public class UARTActivity extends BleProfileServiceReadyActivity onConfigurationAddedOrEdited(final long id, final UartConfiguration configuration) { - if (mGoogleApiClient == null || !mGoogleApiClient.isConnected()) + if (!hasConnectedApi()) return null; final PutDataMapRequest mapRequest = PutDataMapRequest.create(Constants.UART.CONFIGURATIONS + "/" + id); @@ -115,7 +122,7 @@ public class UARTConfigurationSynchronizer { * @return pending result */ public PendingResult onConfigurationDeleted(final long id) { - if (mGoogleApiClient == null || !mGoogleApiClient.isConnected()) + if (!hasConnectedApi()) return null; return Wearable.DataApi.deleteDataItems(mGoogleApiClient, id2Uri(id)); } diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar new file mode 100644 index 00000000..ee9021ad Binary files /dev/null and b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar differ diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar.md5 new file mode 100644 index 00000000..5bbd4319 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar.md5 @@ -0,0 +1 @@ +c9033445b4f085cf0aa953926eb31139 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar.sha1 new file mode 100644 index 00000000..ed7fe231 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.aar.sha1 @@ -0,0 +1 @@ +a78311711a9c6d69d1f611b177d75912cc27207c \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom new file mode 100644 index 00000000..275b5508 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom @@ -0,0 +1,18 @@ + + + 4.0.0 + com.google.android.gms + play-services-base + 7.8.87 + aar + + + com.android.support + support-v4 + 22.2.0 + compile + aar + + + diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom.md5 new file mode 100644 index 00000000..81cf5fa5 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom.md5 @@ -0,0 +1 @@ +842db4d478652b1e85e3b360c59f2eca \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom.sha1 new file mode 100644 index 00000000..3b9477f3 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/7.8.87/play-services-base-7.8.87.pom.sha1 @@ -0,0 +1 @@ +388990307bd2886d0a7db78ccad136ba3b60b51b \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml b/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml new file mode 100644 index 00000000..33a1c117 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml @@ -0,0 +1,12 @@ + + + com.google.android.gms + play-services-base + + 7.8.87 + + 7.8.87 + + 20160122142403 + + diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml.md5 new file mode 100644 index 00000000..992aa4f2 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml.md5 @@ -0,0 +1 @@ +b9f5ee764168532d755f67199a04e464 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml.sha1 new file mode 100644 index 00000000..242ac728 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-base/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +a6b3c7a460e1cf0a42c1f752f0bbbf5053d2b326 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar new file mode 100644 index 00000000..9146938d Binary files /dev/null and b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar differ diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar.md5 new file mode 100644 index 00000000..a250513b --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar.md5 @@ -0,0 +1 @@ +83504530d93744fb864de4bbee4d86bb \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar.sha1 new file mode 100644 index 00000000..1b9eb025 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.aar.sha1 @@ -0,0 +1 @@ +ca0adc50643f55dab199cb7167ca05372543e12e \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom new file mode 100644 index 00000000..ccbc2cd9 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom @@ -0,0 +1,18 @@ + + + 4.0.0 + com.google.android.gms + play-services-wearable + 7.8.87 + aar + + + com.google.android.gms + play-services-base + 7.8.87 + compile + aar + + + diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom.md5 new file mode 100644 index 00000000..2e5ef325 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom.md5 @@ -0,0 +1 @@ +739994909dc5fd30a4082102a31a0a5e \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom.sha1 new file mode 100644 index 00000000..2da3e5db --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/7.8.87/play-services-wearable-7.8.87.pom.sha1 @@ -0,0 +1 @@ +6741fa53e09bf4b40fd982c87c6820bba5788df8 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml new file mode 100644 index 00000000..588592ad --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml @@ -0,0 +1,12 @@ + + + com.google.android.gms + play-services-wearable + + 7.8.87 + + 7.8.87 + + 20160122142522 + + diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml.md5 new file mode 100644 index 00000000..fb104f33 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml.md5 @@ -0,0 +1 @@ +5149ad6a0417933eed9b55741c144282 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml.sha1 new file mode 100644 index 00000000..174b8471 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services-wearable/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +778c562ea8f51095b26d0e0d2ce20d79a320505d \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar new file mode 100644 index 00000000..2c10ad5b Binary files /dev/null and b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar differ diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar.md5 new file mode 100644 index 00000000..c88d7683 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar.md5 @@ -0,0 +1 @@ +679957fdc9da2dce6111ac417fcd3238 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar.sha1 new file mode 100644 index 00000000..27fdb7ff --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.aar.sha1 @@ -0,0 +1 @@ +243d1a6ba16f2a4c1ccd19e3526e393584647e32 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom new file mode 100644 index 00000000..700b6394 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom @@ -0,0 +1,18 @@ + + + 4.0.0 + com.google.android.gms + play-services + 7.8.87 + aar +   +     +      com.android.support +      support-v4 +      22.2.0 +      compile +      aar +     +   + diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom.md5 new file mode 100644 index 00000000..4819481c --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom.md5 @@ -0,0 +1 @@ +9db9c9711eeef4286913c78eca1654fc \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom.sha1 new file mode 100644 index 00000000..e321eb1f --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/7.8.87/play-services-7.8.87.pom.sha1 @@ -0,0 +1 @@ +6d34bc667647052417927ef361176a1288f629ab \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml b/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml new file mode 100644 index 00000000..93051fe2 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml @@ -0,0 +1,12 @@ + + + com.google.android.gms + play-services + + 7.8.87 + + 7.8.87 + + 20160122142802 + + diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml.md5 b/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml.md5 new file mode 100644 index 00000000..86ef6a71 --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml.md5 @@ -0,0 +1 @@ +eb2e8c0689b46bfbd05bff7431559569 \ No newline at end of file diff --git a/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml.sha1 b/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml.sha1 new file mode 100644 index 00000000..27dda2fc --- /dev/null +++ b/google-play-services-7-8-87/com/google/android/gms/play-services/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +9ca5b558fcb911cf330b71ab7b0ea83843fc9a6c \ No newline at end of file diff --git a/wear/build.gradle b/wear/build.gradle index 36a54a9e..d4cde5a8 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + publishNonDefault true compileSdkVersion 25 buildToolsVersion "25.0.1" @@ -8,8 +9,8 @@ android { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 20 targetSdkVersion 25 - versionCode 56 - versionName "2.2.1" + versionCode 202225700 // target: 25, version: 2.2.2, build: 57, multi-APK: 01 + versionName "2.2.2" } buildTypes { release { @@ -17,12 +18,23 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + productFlavors { + wear1 { + // Use the defaultConfig value + } + wear2 { + minSdkVersion 25 + versionCode 252225701 // target: 25, version: 2.2.2, build: 57, multi-APK: 01 + } + } } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.android.support:wearable:1.4.0' - compile 'com.google.android.gms:play-services-wearable:9.2.0' + compile 'com.google.android.support:wearable:2.0.0' + // nRF Toolbox is using Play Service 7.8.87 in order to make the app working in China: + // https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK + compile 'com.google.android.gms:play-services-wearable:7.8.87' compile 'no.nordicsemi.android.support.v18:scanner:1.0.0' compile project(':common') } diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index 66de8b6b..3aff18c2 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -38,6 +38,9 @@ android:label="@string/app_name" android:theme="@android:style/Theme.DeviceDefault.Light"> +