Version 1.16.4 - Selection of EOL in UART added, support for Marshmal…

…low in Wear
swFan · Jun 14, 2016 · 310e2c1 · 310e2c1
1 parent b4fdad1
commit 310e2c1
Show file tree

Hide file tree

Showing 35 changed files with 242 additions and 496 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/dictionaries/*.xml
-/.idea/libraries
+/.idea
+*.iml
 .DS_Store
 /build
 /key*
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/BSD.xml b/.idea/copyright/BSD.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 23
-        versionCode 42
-        versionName "1.16.3"
+        versionCode 43
+        versionName "1.16.4"
     }
     buildTypes {
         release {
@@ -21,10 +21,10 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services-wearable:8.3.0'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'no.nordicsemi.android.support.v18:scanner:0.1.1'
+    compile 'com.google.android.gms:play-services-wearable:9.0.2'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:design:23.4.0'
+    compile 'no.nordicsemi.android.support.v18:scanner:0.2.0'
     compile 'no.nordicsemi.android:log:2.0.0'
     compile('org.simpleframework:simple-xml:2.7.1') {
         exclude group: 'stax', module: 'stax-api'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -233,7 +233,9 @@
 			android:label="@string/uart_feature_title" />
 		<service android:name=".wearable.MainWearableListenerService">
 			<intent-filter>
-				<action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
+				<action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
+				<action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
+				<data android:scheme="wear" android:host="*" android:pathPrefix="/nrftoolbox" />
 			</intent-filter>
 		</service>