From a924a461491abf2e00ce67770aa18d558040afd9 Mon Sep 17 00:00:00 2001 From: Jannik Date: Tue, 24 Feb 2026 17:29:59 +0100 Subject: [PATCH] update gradle wrapper, agp, kotlin and libraries --- app/build.gradle | 21 ++++++++++----------- build.gradle | 4 ++-- gradle.properties | 12 +++++++++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 64d6e85..8e90f1c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,7 @@ kotlin { } android { - compileSdk 34 - buildToolsVersion = '34.0.0' + compileSdk 35 defaultConfig { applicationId "org.mosad.teapod" @@ -24,7 +23,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "build_time", buildTime() - setProperty("archivesBaseName", "teapod-$versionName") + archivesBaseName = "teapod-" + versionName } buildFeatures { @@ -49,17 +48,17 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3' - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.core:core-splashscreen:1.0.1' implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3' - implementation 'androidx.navigation:navigation-ui-ktx:2.8.3' - implementation 'androidx.security:security-crypto:1.1.0-alpha06' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' + implementation 'androidx.navigation:navigation-fragment-ktx:2.8.9' + implementation 'androidx.navigation:navigation-ui-ktx:2.8.9' + implementation 'androidx.security:security-crypto:1.1.0-alpha07' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6' - implementation "androidx.paging:paging-runtime-ktx:3.3.2" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7' + implementation "androidx.paging:paging-runtime-ktx:3.3.6" implementation 'com.google.android.material:material:1.12.0' implementation "com.google.android.exoplayer:exoplayer-core:$exo_version" diff --git a/build.gradle b/build.gradle index 06f608c..bde385e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "2.0.20" + ext.kotlin_version = '2.2.10' ext.ktor_version = "3.0.0" ext.exo_version = "2.18.7" repositories { @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.7.1' + classpath 'com.android.tools.build:gradle:9.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 738f963..c733cc8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,14 @@ android.enableJetifier=false # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official android.nonTransitiveRClass=false -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=false +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..23449a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME