Merge pull request #71 from NordicSemiconductor/develop

Release v2.7.2
NordicSemiconductor · Apr 8, 2019 · 08b67a2 · 08b67a2
2 parents e77097c + 2b9072e
commit 08b67a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 68
-        versionName "2.7.1"
+        versionCode 69
+        versionName "2.7.2"
         resConfigs "en"
 
         vectorDrawables.useSupportLibrary = true
@@ -42,7 +42,7 @@ dependencies {
     //noinspection GradleDependency
     implementation 'com.google.android.gms:play-services-wearable:10.2.0'
 
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
     implementation 'androidx.preference:preference:1.1.0-alpha04'
     implementation 'com.google.android.material:material:1.1.0-alpha05'
 

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -98,7 +98,7 @@
 	</style>
 
 	<style name="Widget.Connect" parent="@style/Widget.MaterialComponents.Button">
-		<item name="android:theme">@style/ConnectTheme</item>
+		<item name="theme">@style/ConnectTheme</item>
 		<item name="android:minWidth">200dp</item>
 		<item name="android:minHeight">52dp</item>
 	</style>

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 282716802 // target: 28, version: 2.6.0, build: 68, multi-APK: 01
-        versionName "2.7.1"
+        versionCode 282726903 // target: 28, version: 2.6.0, build: 68, multi-APK: 01
+        versionName "2.7.2"
         resConfigs "en"
     }
     lintOptions {
@@ -39,7 +39,7 @@ configurations.all() { configuration -> exclude group: "org.apache.httpcomponent
 
 dependencies {
     implementation project(':common')
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha03'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'com.google.android.support:wearable:2.4.0'
     compileOnly 'com.google.android.wearable:wearable:2.4.0'