From 68a0cb40a6727f900e584f8990bc247df6d92013 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 8 Mar 2023 12:12:58 -0400 Subject: [PATCH] Update several AndroidX libraries. activity -> 1.6.1 appcompat -> 1.6.1 fragment -> 1.5.5 navigation -> 2.5.3 core-ktx -> 1.9.0 safe-args -> 2.5.3 --- app/build.gradle | 2 +- build.gradle | 2 +- dependencies.gradle | 11 +- gradle/verification-metadata.xml | 188 +++++++++++------- .../signal/smsexporter/SmsExportService.kt | 2 + 5 files changed, 124 insertions(+), 81 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 098c861c1..71d3e8b78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -432,7 +432,7 @@ dependencies { implementation (libs.androidx.appcompat) { version { - strictly '1.5.1' + strictly '1.6.1' } } implementation libs.androidx.window.window diff --git a/build.gradle b/build.gradle index 93079c267..1d7f57761 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { dependencies { classpath 'com.android.tools:r8:3.3.75' classpath 'com.android.tools.build:gradle:7.4.0' - classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2' + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath libs.ktlint diff --git a/dependencies.gradle b/dependencies.gradle index 127906e17..0550a5438 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,10 +4,11 @@ dependencyResolutionManagement { versionCatalogs { libs { + version('androidx-appcompat', '1.6.1') version('androidx-camera', '1.2.1') - version('androidx-fragment', '1.5.2') + version('androidx-fragment', '1.5.5') version('androidx-lifecycle', '2.5.1') - version('androidx-navigation', '2.5.2') + version('androidx-navigation', '2.5.3') version('androidx-window', '1.0.0') version('exoplayer', '2.18.1') version('glide', '4.13.2') @@ -37,12 +38,12 @@ dependencyResolutionManagement { alias('ktlint').to('org.jlleitschuh.gradle:ktlint-gradle:11.1.0') // Android X - alias('androidx-activity-ktx').to('androidx.activity:activity-ktx:1.5.1') - alias('androidx-core-ktx').to('androidx.core:core-ktx:1.8.0') + alias('androidx-activity-ktx').to('androidx.activity', 'activity-ktx').versionRef('androidx-appcompat') + alias('androidx-appcompat').to('androidx.appcompat', 'appcompat').versionRef('androidx-appcompat') + alias('androidx-core-ktx').to('androidx.core:core-ktx:1.9.0') alias('androidx-fragment-ktx').to('androidx.fragment', 'fragment-ktx').versionRef('androidx-fragment') alias('androidx-fragment-testing').to('androidx.fragment', 'fragment-testing').versionRef('androidx-fragment') alias('androidx-annotation').to('androidx.annotation:annotation:1.4.0') - alias('androidx-appcompat').to('androidx.appcompat:appcompat:1.5.1') alias('androidx-constraintlayout').to('androidx.constraintlayout:constraintlayout:2.0.4') alias('androidx-window-window').to('androidx.window', 'window').versionRef('androidx-window') alias('androidx-window-java').to('androidx.window', 'window-java').versionRef('androidx-window') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index afc8e0c1c..deecadbfe 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -28,6 +28,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -44,6 +52,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -91,20 +107,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + + + + + + + + + @@ -400,17 +424,25 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + - - - + + + - - + + @@ -531,28 +563,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -768,52 +800,52 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -824,28 +856,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - + + + + + + + + + + - - + + - - - + + + - - + + - - - + + + - - + + diff --git a/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt b/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt index cc5b7b87b..09ac89ce0 100644 --- a/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt +++ b/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt @@ -1,5 +1,6 @@ package org.signal.smsexporter +import android.annotation.SuppressLint import android.app.Notification import android.app.Service import android.content.Intent @@ -54,6 +55,7 @@ abstract class SmsExportService : Service() { return START_NOT_STICKY } + @SuppressLint("MissingPermission") private fun startExport(clearExportState: Boolean) { if (isStarted) { Log.d(TAG, "Already running exporter.")