Skip to content

Commit 8d01781

Browse files
committed
升级kotlin到2.3.0,okhttp到5.3.2,gradle到9.0
1 parent 59b572d commit 8d01781

File tree

5 files changed

+28
-37
lines changed

5 files changed

+28
-37
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,16 @@ android {
4747
}
4848

4949
dependencies {
50-
implementation(libs.androidx.activity.compose)
51-
implementation(platform(libs.androidx.compose.bom))
5250
implementation(libs.androidx.core.ktx)
5351
implementation(libs.kotlin.coroutines)
5452
implementation(libs.androidx.lifecycle.runtime.ktx)
55-
implementation(libs.androidx.ui)
56-
implementation(libs.androidx.ui.graphics)
57-
implementation(libs.androidx.ui.tooling.preview)
58-
implementation(libs.androidx.material3)
53+
5954
implementation(libs.androidx.activity)
6055
implementation(libs.androidx.constraintlayout)
6156
testImplementation(libs.junit)
6257
androidTestImplementation(libs.androidx.junit)
6358
androidTestImplementation(libs.androidx.espresso.core)
64-
androidTestImplementation(libs.androidx.ui.test.junit4)
65-
androidTestImplementation(platform(libs.androidx.compose.bom))
66-
debugImplementation(libs.androidx.ui.tooling)
67-
debugImplementation(libs.androidx.ui.test.manifest)
59+
6860

6961
implementation(libs.androidx.appcompat)
7062
implementation(libs.google.material)

gradle.properties

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,14 @@ kotlin.code.style=official
2020
# Enables namespacing of each library's R class so that its R class includes only the
2121
# resources declared in the library itself and none from the library's dependencies,
2222
# thereby reducing the size of the R class for that library
23-
android.nonTransitiveRClass=true
23+
android.nonTransitiveRClass=true
24+
android.defaults.buildfeatures.resvalues=true
25+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
26+
android.enableAppCompileTimeRClass=false
27+
android.usesSdkInManifest.disallowed=false
28+
android.uniquePackageNames=false
29+
android.dependency.useConstraints=true
30+
android.r8.strictFullModeForKeepRules=false
31+
android.r8.optimizedResourceShrinking=false
32+
android.builtInKotlin=false
33+
android.newDsl=false

gradle/libs.versions.toml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
[versions]
2-
agp = "8.12.1"
3-
appcompat = "1.7.0"
4-
glide = "5.0.4"
2+
agp = "9.0.0"
3+
appcompat = "1.7.1"
4+
glide = "5.0.5"
55
gson = "2.13.2"
6-
kotlin = "2.2.20"
7-
ksp = "2.2.10-2.0.2"
8-
coreKtx = "1.13.1"
6+
kotlin = "2.3.0"
7+
ksp = "2.3.2"
8+
coreKtx = "1.17.0"
99
junit = "4.13.2"
10-
junitVersion = "1.2.1"
11-
espressoCore = "3.6.1"
12-
lifecycleRuntimeKtx = "2.8.4"
13-
activityCompose = "1.8.2"
14-
composeBom = "2024.09.00"
15-
materialVersion = "1.12.0"
10+
junitVersion = "1.3.0"
11+
espressoCore = "3.7.0"
12+
lifecycleRuntimeKtx = "2.9.4"
13+
materialVersion = "1.13.0"
1614
coroutinesVersion = "1.10.2"
17-
okhttpVersion = "5.1.0"
18-
activity = "1.8.2"
19-
constraintlayout = "2.1.4"
15+
okhttpVersion = "5.3.2"
16+
activity = "1.11.0"
17+
constraintlayout = "2.2.1"
2018

2119
[libraries]
2220
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
@@ -29,15 +27,6 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
2927
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
3028
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
3129
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
32-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
33-
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
34-
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
35-
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
36-
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
37-
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
38-
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest"}
39-
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
40-
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
4130
okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttpVersion" }
4231
logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttpVersion" }
4332
okhttp-module = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttpVersion" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Feb 25 12:44:58 CST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

oklibrary/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ publishing { // 发布配置
6868
register<MavenPublication>("release") { // 注册一个名字为 release 的发布内容
6969
groupId = "com.gateoftruth.library"
7070
artifactId = "OkSimple"
71-
version = "3.4.7"
71+
version = "3.4.8"
7272

7373
afterEvaluate { // 在所有的配置都完成之后执行
7474
// 从当前 module 的 release 包中发布

0 commit comments

Comments
 (0)