From f803510760fe27642557bdf2533e2f9ec8496cfe Mon Sep 17 00:00:00 2001
From: "Rajaratnam, Roshan" <Roshan.Rajaratnam@nordicsemi.no>
Date: Mon, 8 Apr 2019 13:46:25 +0200
Subject: [PATCH 1/3] fixes a crash on Android 6.0.1 due to invalid theme
 attribute

---
 app/src/main/res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5e685dce..51ac2229e 100644
--- 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>

From 922c5976c28cb317772c600155b5f3049cc2a5a8 Mon Sep 17 00:00:00 2001
From: "Rajaratnam, Roshan" <Roshan.Rajaratnam@nordicsemi.no>
Date: Mon, 8 Apr 2019 13:49:17 +0200
Subject: [PATCH 2/3] Upgraded recyclerView dependencies

---
 app/build.gradle  | 2 +-
 wear/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 157337618..b272e0b15 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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/wear/build.gradle b/wear/build.gradle
index 79f1d15cf..316fb9e18 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -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'

From 2b9072eb8a5bfaf49c561017e245349fab07e22c Mon Sep 17 00:00:00 2001
From: "Rajaratnam, Roshan" <Roshan.Rajaratnam@nordicsemi.no>
Date: Mon, 8 Apr 2019 13:54:43 +0200
Subject: [PATCH 3/3] Version codes bumped for release

---
 app/build.gradle  | 4 ++--
 wear/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b272e0b15..ad89eb42f 100644
--- 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
diff --git a/wear/build.gradle b/wear/build.gradle
index 316fb9e18..d61045212 100644
--- 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 {