From e7330966d957ccf6d8dfe4fc0eed43143e40d17e Mon Sep 17 00:00:00 2001 From: dece Date: Tue, 20 Aug 2024 20:17:47 +0200 Subject: [PATCH] update target SDK to 35 & up. gradle Target SDK 33 to 35. Gradle 7 to 8 --- app/build.gradle | 27 ++++++++++++------------ app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 6 +++--- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 439945a..fe86d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,12 +6,12 @@ plugins { } android { - compileSdk 33 + compileSdk 35 defaultConfig { applicationId "dev.lowrespalmtree.comet" minSdk 24 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "0.1.0" @@ -43,27 +43,28 @@ android { kotlinOptions { jvmTarget = '1.8' } + namespace 'dev.lowrespalmtree.comet' } dependencies { - def nav_version = "2.5.3" - def room_version = "2.5.1" - implementation 'androidx.appcompat:appcompat:1.6.1' + def nav_version = '2.7.7' + def room_version = '2.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation "androidx.cardview:cardview:1.0.0" implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.core:core-ktx:1.10.0' - implementation 'androidx.fragment:fragment-ktx:1.5.6' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' + implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.fragment:fragment-ktx:1.8.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" - implementation 'androidx.preference:preference-ktx:1.2.0' - implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.preference:preference-ktx:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.12.0' kapt "androidx.room:room-compiler:$room_version" testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 003be41..f4ab2f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index 7db2469..d61ad19 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,12 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.5.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0' - classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3' + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7' } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 98bed16..8145fa7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,7 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8a19571..7ea345e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Nov 29 12:01:36 CET 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME