Merge branch 'develop'

2025-12-21 00:14:24 +01:00 · 2020-05-27 15:16:52 +02:00
parent de747c369f e50ff7a817
commit acd2193c1a
12 changed files with 3 additions and 3 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
        applicationId "no.nordicsemi.android.nrftoolbox"
        minSdkVersion 18
        targetSdkVersion 29
-        versionCode 77
+        versionCode 78
        versionName "2.9.0"
        resConfigs "en"
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
        applicationId "no.nordicsemi.android.nrftoolbox"
        minSdkVersion 23
        targetSdkVersion 29
-        versionCode 292907701 // target: 29, version: 2.9.0, build: 77, multi-APK: 01
+        versionCode 292907703 // target: 29, version: 2.9.0, build: 77, multi-APK: 03
-        versionName "2.8.4"
+        versionName "2.9.0"
        resConfigs "en"
    }
    lintOptions {