From 397bfdaf4b8a3f8653b070630d6776fa50329bec Mon Sep 17 00:00:00 2001 From: dingyi Date: Thu, 28 Nov 2024 16:07:56 +0800 Subject: [PATCH] build: update dependencies and Gradle version - Update compileSdk and targetSdk to 35 - Update Gradle plugin to 8.9.0-alpha03 - Update Kotlin plugin to 2.0.20 - Update gradle wrapper to 8.11.1- Update app dependencies: - core-ktx: 1.12.0 -> 1.15.0 - coroutines-core: 1.7.3 -> 1.8.0 - coroutines-android: 1.7.3 -> 1.8.0 - lifecycle-runtime-ktx: 2.6.2 -> 2.8.7 - appcompat: 1.6.1 -> 1.7.0 - material:1.9.0 -> 1.12.0 - constraintlayout: 2.1.4 -> 2.2.0 - Update treeview dependencies: - core-ktx: 1.12.0 -> 1.15.0 - appcompat: 1.6.1 -> 1.7.0 - material: 1.9.0 -> 1.12.0 - Remove unused dependencies from treeview --- .idea/deploymentTargetSelector.xml | 10 ++++++++++ .idea/runConfigurations.xml | 17 +++++++++++++++++ app/build.gradle.kts | 19 ++++++++++--------- build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- treeview/build.gradle.kts | 8 ++++---- 6 files changed, 45 insertions(+), 17 deletions(-) create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/runConfigurations.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 16cf57e..777ab3d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,12 +5,12 @@ plugins { android { namespace = "com.dingyi.treeview" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.dingyi.treeview" minSdk = 21 - targetSdk = 33 + targetSdk = 35 versionCode = 1 versionName = "1.0" @@ -41,14 +41,15 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.12.0") implementation(project(":treeview")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.9.0") - implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.core:core-ktx:1.15.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0") + + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") + implementation("androidx.constraintlayout:constraintlayout:2.2.0") } diff --git a/build.gradle.kts b/build.gradle.kts index 8b9c9ee..6c1a432 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id ("com.android.application") version "8.2.0-alpha15" apply false - id ("com.android.library") version "8.2.0-alpha15" apply false - id ("org.jetbrains.kotlin.android") version "1.9.0" apply false + id ("com.android.application") version "8.9.0-alpha03" apply false + id ("com.android.library") version "8.9.0-alpha03" apply false + id ("org.jetbrains.kotlin.android") version "2.0.20" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bc12265..e4b96cf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Dec 08 11:09:42 HKT 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/treeview/build.gradle.kts b/treeview/build.gradle.kts index 6f6ed32..af43268 100644 --- a/treeview/build.gradle.kts +++ b/treeview/build.gradle.kts @@ -8,7 +8,7 @@ plugins { android { namespace = "io.github.dingyi222666.view.treeview" - compileSdk = 33 + compileSdk = 35 defaultConfig { minSdk = 21 @@ -74,7 +74,7 @@ mavenPublishing { dependencies { - compileOnly("androidx.core:core-ktx:1.12.0") - compileOnly("androidx.appcompat:appcompat:1.6.1") - compileOnly("com.google.android.material:material:1.9.0") + compileOnly("androidx.core:core-ktx:1.15.0") + compileOnly("androidx.appcompat:appcompat:1.7.0") + compileOnly("com.google.android.material:material:1.12.0") } \ No newline at end of file