Skip to content

Commit c147b82

Browse files
REBOOTERSREBOOTERS
committed
lib upgrade
1 parent e182081 commit c147b82

File tree

12 files changed

+46
-47
lines changed

12 files changed

+46
-47
lines changed

‎app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ android {
8585
free {
8686
versionNameSuffix "_free"
8787
resourceConfigurations += ['ch', 'xhdpi']
88-
minSdk 21
88+
minSdk 23
8989
aaptOptions.cruncherEnabled = false
9090
ext.alwaysUpdateBuildId = false
9191
}
9292

9393
charge {
9494
versionNameSuffix "_charge"
9595
resourceConfigurations += ['en', 'xhdpi']
96-
minSdk 21
96+
minSdk 23
9797
aaptOptions.cruncherEnabled = false
9898
ext.alwaysUpdateBuildId = false
9999
}
@@ -143,7 +143,7 @@ dependencies {
143143
implementation "androidx.cardview:cardview:1.0.0"
144144
implementation "com.github.bumptech.glide:glide:$ext.glide"
145145
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
146-
implementation 'com.squareup.okio:okio:3.9.0'
146+
implementation 'com.squareup.okio:okio:3.9.1'
147147
implementation 'androidx.multidex:multidex:2.0.1'
148148
implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
149149
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout"
@@ -156,7 +156,7 @@ dependencies {
156156
kapt 'com.jakewharton:butterknife-compiler:10.2.3'
157157
implementation 'com.facebook.stetho:stetho:1.6.0'
158158
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
159-
implementation 'com.airbnb.android:lottie:6.5.2'
159+
implementation 'com.airbnb.android:lottie:6.6.2'
160160
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
161161
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
162162
implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
@@ -165,7 +165,7 @@ dependencies {
165165
kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
166166

167167
implementation "androidx.palette:palette-ktx:1.0.0"
168-
implementation 'com.tencent:mmkv:1.3.9'
168+
implementation 'com.tencent:mmkv:2.0.2'
169169

170170
testImplementation 'junit:junit:4.13.2'
171171
androidTestImplementation 'androidx.test:runner:1.6.2'
@@ -174,7 +174,7 @@ dependencies {
174174
implementation 'com.jakewharton.hugo:hugo-runtime:1.2.1'
175175

176176

177-
implementation 'com.facebook.fresco:fresco:3.2.0'
177+
implementation 'com.facebook.fresco:fresco:3.5.0'
178178
implementation 'com.github.chrisbanes:PhotoView:2.1.4'
179179
implementation 'com.github.REBOOTERS:Matisse:v0.6.0'
180180
implementation 'com.guolindev.permissionx:permissionx:1.8.1'

‎buildSrc/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ dependencies {
77
// groovy sdk
88
implementation gradleApi()
99
// implementation localGroovy()
10-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0'
10+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.0'
1111
// 添加了这个，就可以看 Android Gradle 插件的源码了
1212
implementation 'com.android.tools.build:gradle-api:8.8.0'
1313
// implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.40"
1414
implementation 'com.google.code.gson:gson:2.11.0'
15-
implementation 'com.android.tools:common:31.6.0'
16-
implementation 'commons-io:commons-io:2.16.1'
15+
implementation 'com.android.tools:common:31.7.3'
16+
implementation 'commons-io:commons-io:2.18.0'
1717
// implementation 'org.ow2.asm:asm:7.0'
1818
implementation 'org.ow2.asm:asm-commons:9.7'
19-
implementation('org.ow2.asm:asm-util:9.7')
19+
implementation('org.ow2.asm:asm-util:9.7.1')
2020
}
2121

2222
repositories {
@@ -28,11 +28,11 @@ repositories {
2828

2929

3030
buildscript {
31-
ext.kotlin_version = '1.9.22'
31+
// ext.kotlin_version = '1.9.22'
3232
repositories {
3333
mavenCentral()
3434
}
3535
dependencies {
36-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
36+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
3737
}
3838
}

‎config.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
22
compileSdk = 35
33

4-
minSdk = 21
4+
minSdk = 23
55
targetSdk = 35
66

77

88
support_version = '1.3.2'
99
androidx_appcompat = '1.7.0'
1010
androidx_material = '1.12.0'
1111
androidx_preference = '1.2.1'
12-
constraint_layout = '2.1.4'
13-
core_ktx = '1.13.1'
12+
constraint_layout = '2.2.0'
13+
core_ktx = '1.15.0'
1414

1515
kotlin_version = '2.0.0'
1616
gradle_version = '8.1.1'
@@ -29,6 +29,6 @@ ext {
2929
roomVersion_runtime = '2.6.1'
3030
archLifecycleVersion = '2.2.0'
3131

32-
kotlin_coroutines = '1.8.1'
33-
kotlin_coroutines_android = '1.8.1'
32+
kotlin_coroutines = '1.10.1'
33+
kotlin_coroutines_android = '1.10.1'
3434
}

‎gradle/libs.versions.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
agp = "8.7.0"
33
kotlin = "2.0.0"
4-
coreKtx = "1.10.1"
4+
coreKtx = "1.15.0"
55
junit = "4.14-SNAPSHOT"
6-
junitVersion = "1.1.5"
7-
espressoCore = "3.5.1"
8-
lifecycleRuntimeKtx = "2.6.1"
9-
activityCompose = "1.8.0"
10-
composeBom = "2024.04.01"
11-
coilCompose = "2.4.0"
12-
composeRuntimeLiveData="1.7.0"
13-
accompanistPager = "0.24.7-alpha"
14-
lifecycleViewmodelCompose = "2.8.5"
6+
junitVersion = "1.2.1"
7+
espressoCore = "3.6.1"
8+
lifecycleRuntimeKtx = "2.8.7"
9+
activityCompose = "1.9.3"
10+
composeBom = "2024.12.01"
11+
coilCompose = "2.7.0"
12+
composeRuntimeLiveData= "1.7.6"
13+
accompanistPager = "0.36.0"
14+
lifecycleViewmodelCompose = "2.8.7"
1515

1616

1717
[libraries]

‎imitate/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ dependencies {
135135
implementation "androidx.constraintlayout:constraintlayout:${ext.constraint_layout}"
136136
implementation "com.github.bumptech.glide:glide:$ext.glide"
137137
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
138-
implementation 'androidx.lifecycle:lifecycle-process:2.8.5'
139-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5'
138+
implementation 'androidx.lifecycle:lifecycle-process:2.8.7'
139+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
140140

141141

142142
testImplementation 'junit:junit:4.13.2'
@@ -221,8 +221,8 @@ dependencies {
221221
implementation 'com.beust:klaxon:5.6'
222222
implementation 'com.alibaba:fastjson:2.0.19.graal'
223223
implementation 'com.google.code.gson:gson:2.11.0'
224-
implementation 'com.google.dagger:dagger:2.52'
225-
kapt 'com.google.dagger:dagger-compiler:2.52'
224+
implementation 'com.google.dagger:dagger:2.54'
225+
kapt 'com.google.dagger:dagger-compiler:2.54'
226226

227227
// coroutines
228228
// 👇 依赖协程核心库
@@ -233,10 +233,10 @@ dependencies {
233233
implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0' //核心必须依赖
234234
implementation 'io.github.scwang90:refresh-header-classics:2.1.0' //经典刷新头
235235
implementation 'io.github.scwang90:refresh-header-radar:2.1.0' //雷达刷新头
236-
implementation 'io.github.scwang90:refresh-header-falsify:2.1.0' //虚拟刷新头
236+
implementation 'io.github.scwang90:refresh-header-falsify:2.1.1' //虚拟刷新头
237237
implementation 'io.github.scwang90:refresh-header-material:2.1.0' //谷歌刷新头
238238
implementation 'io.github.scwang90:refresh-header-two-level:2.1.0' //二级刷新头
239-
implementation 'io.github.scwang90:refresh-footer-ball:2.1.0' //球脉冲加载
239+
implementation 'io.github.scwang90:refresh-footer-ball:2.1.1' //球脉冲加载
240240
implementation 'io.github.scwang90:refresh-footer-classics:2.1.0' //经典加载
241241

242242
implementation 'androidx.metrics:metrics-performance:1.0.0-beta01'

‎imitate/src/main/module/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.engineer.imitate">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
76

‎subs/ai/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
implementation "androidx.core:core-ktx:${ext.core_ktx}"
4545
implementation "androidx.appcompat:appcompat:$ext.androidx_appcompat"
4646
implementation "com.google.android.material:material:${ext.androidx_material}"
47-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
47+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
4848
testImplementation 'junit:junit:4.13.2'
4949
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
5050
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

‎subs/compose/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
api libs.androidx.ui.tooling.preview
4545
api libs.androidx.material3
4646
api libs.coil.compose
47-
api "io.coil-kt:coil-gif:2.6.0"
47+
api 'io.coil-kt:coil-gif:2.7.0'
4848

4949
api libs.androidx.compose.runtime
5050
api libs.androidx.lifecycle.viewmodel.compose

‎subs/dataview/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ dependencies {
3333
implementation fileTree(dir: 'libs', include: ['*.jar'])
3434

3535
implementation 'androidx.appcompat:appcompat:1.7.0'
36-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
36+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
3737
testImplementation 'junit:junit:4.13.2'
38-
androidTestImplementation 'androidx.test:runner:1.5.2'
39-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
38+
androidTestImplementation 'androidx.test:runner:1.6.2'
39+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4040

4141
implementation "androidx.room:room-runtime:$ext.roomVersion"
4242
implementation "androidx.room:room-rxjava2:$ext.roomVersion"

‎subs/game/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ dependencies {
4141
implementation "androidx.core:core-ktx:${ext.core_ktx}"
4242
implementation "androidx.appcompat:appcompat:$ext.androidx_appcompat"
4343

44-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
44+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
4545
implementation "androidx.lifecycle:lifecycle-extensions:$ext.archLifecycleVersion"
4646
testImplementation 'junit:junit:4.13.2'
47-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
48-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
47+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
48+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4949
}

‎subs/gif-revert/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ dependencies {
3535

3636
implementation 'androidx.appcompat:appcompat:1.7.0'
3737
testImplementation 'junit:junit:4.13.2'
38-
androidTestImplementation 'androidx.test:runner:1.5.2'
39-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
38+
androidTestImplementation 'androidx.test:runner:1.6.2'
39+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4040

4141
//
4242
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'

‎subs/skeleton/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
implementation "androidx.appcompat:appcompat:$ext.androidx_appcompat"
2525

2626
testImplementation 'junit:junit:4.13.2'
27-
androidTestImplementation 'androidx.test:runner:1.5.2'
28-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
27+
androidTestImplementation 'androidx.test:runner:1.6.2'
28+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
2929
}
3030

0 commit comments

Comments
 (0)