Skip to content

Commit

Permalink
build: update dependencies and Gradle version
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
dingyi222666 committed Nov 28, 2024
1 parent 1706aca commit 397bfda
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 17 deletions.
10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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")

}
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions treeview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

android {
namespace = "io.github.dingyi222666.view.treeview"
compileSdk = 33
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down Expand Up @@ -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")
}

0 comments on commit 397bfda

Please sign in to comment.