From 7fd7ad1ead81974cefb444ee4302c18508d824ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=A4nge?= Date: Mon, 9 Dec 2024 16:14:04 +0100 Subject: [PATCH] Update dependencies - Upgrade backup api to v1.4.0 - Change target sdk to 34 - Upgrade gradle and kotlin version - Update other dependencies --- app/build.gradle | 32 +++++++++---------- app/src/main/AndroidManifest.xml | 3 +- .../PFAShoppingListApplication.kt | 5 ++- build.gradle | 6 ++-- gradle.properties | 6 +++- gradle/wrapper/gradle-wrapper.properties | 6 ++-- libs/privacy-friendly-backup-api | 2 +- 7 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a98871fc..37d631c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-parcelize' android { - compileSdkVersion 33 - defaultConfig { applicationId "privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist" minSdkVersion 19 - targetSdkVersion 33 + compileSdk 34 + targetSdkVersion 34 versionCode 8 versionName "1.1" multiDexEnabled true @@ -23,8 +23,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } testOptions { @@ -58,10 +58,11 @@ android { lint { lintConfig = file("lint.xml") } + namespace 'privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist' } -android.applicationVariants.all { variant -> - variant.outputs.all { +android.applicationVariants.configureEach { variant -> + variant.outputs.configureEach { def appName = "pfa-shopping-list" outputFileName = appName + "-${variant.name}-v${variant.versionName}.apk" } @@ -70,17 +71,16 @@ android.applicationVariants.all { variant -> dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') // android - androidTestImplementation 'androidx.annotation:annotation:1.0.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.cardview:cardview:1.0.0' // tests - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-core:2.7.6' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test:rules:1.6.1' @@ -104,17 +104,17 @@ dependencies { // image zoom implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0' - implementation 'androidx.sqlite:sqlite:2.3.0' - implementation 'androidx.sqlite:sqlite-ktx:2.3.0' + implementation 'androidx.sqlite:sqlite:2.4.0' + implementation 'androidx.sqlite:sqlite-ktx:2.4.0' // Backup API implementation project(':backup-api') - def work_version = '2.7.1' + def work_version = '2.9.0' implementation "androidx.work:work-runtime:$work_version" implementation "androidx.work:work-runtime-ktx:$work_version" androidTestImplementation "androidx.work:work-testing:$work_version" - implementation 'androidx.core:core-ktx:1.7.20' + implementation "androidx.core:core-ktx:$kotlin_version" // Multi-Dex def multidex_version = "2.0.1" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c86f5c80..3cac0ed3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/PFAShoppingListApplication.kt b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/PFAShoppingListApplication.kt index 33dd261f..ed9182e4 100644 --- a/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/PFAShoppingListApplication.kt +++ b/app/src/main/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/PFAShoppingListApplication.kt @@ -34,7 +34,6 @@ class PFAShoppingListApplication : Application(), Configuration.Provider { } } - override fun getWorkManagerConfiguration(): Configuration { - return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build() - } + override val workManagerConfiguration: Configuration + get() = Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build() } \ No newline at end of file diff --git a/build.gradle b/build.gradle index a13bea72..a08c7bbe 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { google() } - ext.kotlin_version = "1.7.20" + ext.kotlin_version = "1.9.10" dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.4' classpath 'me.tatarka:gradle-retrolambda:3.2.5' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -25,6 +25,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/gradle.properties b/gradle.properties index 915f0e66..caa86e8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,9 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.nonFinalResIds=false +android.nonTransitiveRClass=false +android.useAndroidX=true +org.gradle.jvmargs=-Xmx1536m \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cfe1e47..571cdad7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 13 12:17:28 CET 2023 +#Mon Dec 09 15:57:39 CET 2024 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/libs/privacy-friendly-backup-api b/libs/privacy-friendly-backup-api index d267b0d5..14ee29f5 160000 --- a/libs/privacy-friendly-backup-api +++ b/libs/privacy-friendly-backup-api @@ -1 +1 @@ -Subproject commit d267b0d5e899fe12f41a6b7aac2081b8d4ea71af +Subproject commit 14ee29f59bc7c3fbaa765cb1be0fcaab4f948b88