From 37c22786e53cd25253aa16cb0e46dcaf33328129 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Tue, 16 Nov 2021 17:36:02 -0800 Subject: [PATCH 1/3] update libs --- app/build.gradle | 12 ++++++------ build.gradle | 6 +++--- geeksville-androidlib | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0f8bbb1a0..3588a5563 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { keyPassword "$meshtasticKeyPassword" } } */ - compileSdkVersion 30 + compileSdkVersion 31 // leave undefined to use version plugin wants // buildToolsVersion "30.0.2" // Note: 30.0.2 doesn't yet work on Github actions CI defaultConfig { @@ -117,15 +117,15 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.fragment:fragment-ktx:1.3.6' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.1' implementation 'com.google.android.material:material:1.4.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0' implementation "androidx.room:room-runtime:$room_version" kapt "androidx.room:room-compiler:$room_version" @@ -169,7 +169,7 @@ dependencies { implementation 'com.google.android.gms:play-services-auth:19.2.0' // Add the Firebase SDK for Crashlytics. - implementation 'com.google.firebase:firebase-crashlytics:18.2.0' + implementation 'com.google.firebase:firebase-crashlytics:18.2.4' // alas implementation bug deep in the bowels when I tried it for my SyncBluetoothDevice class // implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3" @@ -182,7 +182,7 @@ dependencies { implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } implementation 'com.google.zxing:core:3.4.1' - def work_version = '2.5.0' + def work_version = '2.7.0' // Work Request - used to delay boot event handling // implementation "androidx.work:work-runtime:$work_version" diff --git a/build.gradle b/build.gradle index c593357fe..d62ebed07 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.6.0' ext.coroutines_version = "1.5.1" repositories { @@ -10,7 +10,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" @@ -21,7 +21,7 @@ buildscript { // Check that you have the Google Services Gradle plugin v4.3.2 or later // (if not, add it). classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0' // protobuf plugin - docs here https://github.com/google/protobuf-gradle-plugin classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.15' diff --git a/geeksville-androidlib b/geeksville-androidlib index 01e23aa83..3a1419e1d 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit 01e23aa835324c01794793017692e833f3da8e7f +Subproject commit 3a1419e1dc8eba0f9b2487c8063bf44eed7da2d9 From 33dd04ecca5d5f086aa6c14af89f37cb96605977 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Wed, 17 Nov 2021 11:13:02 -0800 Subject: [PATCH 2/3] fix build --- .idea/deploymentTargetDropDown.xml | 17 +++++++++++++++++ build.gradle | 2 +- geeksville-androidlib | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 000000000..bab7cd61b --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index d62ebed07..c9c652ff1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.6.0' - ext.coroutines_version = "1.5.1" + ext.coroutines_version = "1.5.2" repositories { google() diff --git a/geeksville-androidlib b/geeksville-androidlib index 3a1419e1d..d89974db4 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit 3a1419e1dc8eba0f9b2487c8063bf44eed7da2d9 +Subproject commit d89974db464d3dd84632c6effc9821f5bf10a8a0 From 57e1c4847ea1afec1cd87434e3edb68b63bf0d0a Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Wed, 17 Nov 2021 12:36:22 -0800 Subject: [PATCH 3/3] 1.2.50 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3588a5563..f76760751 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.geeksville.mesh" minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works) targetSdkVersion 30 // 30 can't work until an explicit location permissions dialog is added - versionCode 20245 // format is Mmmss (where M is 1+the numeric major number - versionName "1.2.45" + versionCode 20250 // format is Mmmss (where M is 1+the numeric major number + versionName "1.2.50" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // per https://developer.android.com/studio/write/vector-asset-studio