From 890676e7e5102d659b2aa034be40635b74943569 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 26 Dec 2021 23:25:38 -0300 Subject: [PATCH 1/3] update libs --- app/build.gradle | 12 ++++++------ build.gradle | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2ad854f6b..6cdbc62d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,15 +121,15 @@ protobuf { dependencies { - def room_version = '2.3.0' + def room_version = '2.4.0' implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.appcompat:appcompat:1.4.0' implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.fragment:fragment-ktx:1.3.6' + implementation 'androidx.fragment:fragment-ktx:1.4.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation 'com.google.android.material:material:1.4.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' @@ -174,7 +174,7 @@ dependencies { implementation 'com.google.android.gms:play-services-location:18.0.0' // For Google Sign-In (owner name accesss) - implementation 'com.google.android.gms:play-services-auth:19.2.0' + implementation 'com.google.android.gms:play-services-auth:20.0.0' // Add the Firebase SDK for Crashlytics. implementation 'com.google.firebase:firebase-crashlytics:18.2.6' @@ -190,7 +190,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.7.0' + def work_version = '2.7.1' // Work Request - used to delay boot event handling // implementation "androidx.work:work-runtime:$work_version" diff --git a/build.gradle b/build.gradle index 2d6e740bf..a47645681 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.6.0' + ext.kotlin_version = '1.6.10' ext.coroutines_version = "1.5.2" repositories { From c8d7427f2f6ff8764f11817103a06061947a3369 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 26 Dec 2021 23:26:41 -0300 Subject: [PATCH 2/3] remove duplicate permission --- app/src/main/AndroidManifest.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f5429969b..940195c5d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,8 +21,6 @@ - - From 0d5a2be18afd39ae9f52a680687a36d07e36127c Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 26 Dec 2021 23:27:26 -0300 Subject: [PATCH 3/3] 1.2.52 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6cdbc62d9..12b70ecbb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,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 20251 // format is Mmmss (where M is 1+the numeric major number - versionName "1.2.51" + versionCode 20252 // format is Mmmss (where M is 1+the numeric major number + versionName "1.2.52" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // per https://developer.android.com/studio/write/vector-asset-studio