Skip to content

Commit 5b05a1e

Browse files
afkTafkT
committed
upgrade: 升级 AGP 以及部分 API 变动文件
config: 更新第三方库 jdk: 更新到 JDK 11
1 parent 2b928a0 commit 5b05a1e

File tree

8 files changed

+70
-72
lines changed

8 files changed

+70
-72
lines changed

‎README_PROJECT.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
| 7.0.2 - 7.3.0 | 2.2.9 - 2.4.2 | 14 | 30 - 32 | 1.5.20 - 1.7.10 |
6868
| 8.0.2 - 8.2.1 | 2.4.3 - 2.4.4 | 14 | 33 - 34 | 1.7.10 - 1.9.22 |
6969
| 8.4.0 | 2.4.5 - 2.4.6 | 19 | 34 | 1.9.23 |
70-
| 8.7.3 | 2.4.7 - 2.4.9 | 21 | 35 | 2.1.0 |
70+
| 8.7.3 | 2.4.7 - 2.4.8 | 21 | 35 | 2.1.0 |
71+
| 8.11.1 | 2.4.9 | 23 | 36 | 2.2.10 |
7172

7273

7374
## 项目目录结构（ 全部已迁移至 Maven Central ）

‎application/DevUtilsApp/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@
6060
android:allowBackup="true"
6161
android:icon="@mipmap/icon_launcher"
6262
android:label="@string/app_name"
63-
android:requestLegacyExternalStorage="false"
6463
android:roundIcon="@mipmap/icon_launcher_round"
6564
android:supportsRtl="true"
6665
android:theme="@style/AppTheme.Launcher"
6766
android:usesCleartextTraffic="true"
68-
tools:ignore="AllowBackup,LockedOrientationActivity,UnusedAttribute"
69-
tools:replace="android:requestLegacyExternalStorage">
67+
tools:ignore="AllowBackup,LockedOrientationActivity,UnusedAttribute">
7068

7169
<meta-data
7270
android:name="design_width_in_dp"

‎file/deps/deps_android.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
api deps.kotlin.navigation_ui
2020
// api deps.kotlin.work_runtime
2121
// api deps.kotlin.palette
22-
api deps.kotlin.datastore_preferences
22+
// api deps.kotlin.datastore_preferences
2323

2424
// ============
2525
// = androidx =

‎file/deps/deps_project.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ dependencies {
2525
api deps_lib.common_widget.binding_collection_adapter
2626
api deps_lib.common_widget.binding_collection_adapter_recyclerview
2727
api deps_lib.common_widget.binding_collection_adapter_viewpager2
28-
// 下拉刷新框架 https://github.com/scwang90/SmartRefreshLayout
29-
api deps_lib.common_widget.smartrefreshlayout
30-
api deps_lib.common_widget.smartrefresh_header_classics
31-
api deps_lib.common_widget.smartrefresh_footer_classics
28+
// // 下拉刷新框架 https://github.com/scwang90/SmartRefreshLayout
29+
// api deps_lib.common_widget.smartrefreshlayout
30+
// api deps_lib.common_widget.smartrefresh_header_classics
31+
// api deps_lib.common_widget.smartrefresh_footer_classics
3232
// Dialog 弹窗框架 https://github.com/kongzue/DialogX
3333
api deps_lib.common_widget.dialogX
3434
// 标题栏框架 https://github.com/getActivity/TitleBar
@@ -74,6 +74,6 @@ dependencies {
7474
// = 动画相关组件库 =
7575
// ===============
7676

77-
// 动画库 https://github.com/airbnb/lottie-android
78-
api deps_lib.anim_widget.lottie
77+
// // 动画库 https://github.com/airbnb/lottie-android
78+
// api deps_lib.anim_widget.lottie
7979
}

‎file/gradle/build/unified/unified_library_config.gradle‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ allprojects {
1717
// coroutines
1818
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2",
1919
// lifecycle_runtime
20-
"androidx.lifecycle:lifecycle-runtime-ktx:2.9.3",
20+
"androidx.lifecycle:lifecycle-runtime-ktx:2.9.4",
2121
// lifecycle_viewmodel
22-
"androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3",
22+
"androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4",
2323
// lifecycle_livedata
24-
"androidx.lifecycle:lifecycle-livedata-ktx:2.9.3",
24+
"androidx.lifecycle:lifecycle-livedata-ktx:2.9.4",
2525
// lifecycle_viewmodel_savedstate
26-
"androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3",
26+
"androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4",
2727
// lifecycle_common_java8
28-
"androidx.lifecycle:lifecycle-common-java8:2.9.3",
28+
"androidx.lifecycle:lifecycle-common-java8:2.9.4",
2929
// activity
30-
"androidx.activity:activity-ktx:1.11.0-rc01",
30+
"androidx.activity:activity-ktx:1.11.0",
3131
// fragment
3232
"androidx.fragment:fragment-ktx:1.8.9",
3333
// navigation_fragment
34-
"androidx.navigation:navigation-fragment-ktx:2.9.3",
34+
"androidx.navigation:navigation-fragment-ktx:2.9.5",
3535
// navigation_ui
36-
"androidx.navigation:navigation-ui-ktx:2.9.3",
36+
"androidx.navigation:navigation-ui-ktx:2.9.5",
3737
// work_runtime
38-
"androidx.work:work-runtime-ktx:2.10.3",
38+
"androidx.work:work-runtime-ktx:2.10.5",
3939
// room_runtime
40-
"androidx.room:room-runtime:2.7.2",
40+
"androidx.room:room-runtime:2.8.2",
4141
// room_compiler
42-
"androidx.room:room-compiler:2.7.2",
42+
"androidx.room:room-compiler:2.8.2",
4343
// room
44-
"androidx.room:room-ktx:2.7.2",
44+
"androidx.room:room-ktx:2.8.2",
4545
// palette
4646
"androidx.palette:palette-ktx:1.0.0",
4747
// datastore_preferences
@@ -64,17 +64,17 @@ allprojects {
6464
// viewpager2
6565
"androidx.viewpager2:viewpager2:1.1.0",
6666
// activity
67-
"androidx.activity:activity:1.11.0-rc01",
67+
"androidx.activity:activity:1.11.0",
6868
// fragment
6969
"androidx.fragment:fragment:1.8.9",
7070
// navigation_fragment
71-
"androidx.navigation:navigation-fragment:2.9.3",
71+
"androidx.navigation:navigation-fragment:2.9.5",
7272
// navigation_ui
73-
"androidx.navigation:navigation-ui:2.9.3",
73+
"androidx.navigation:navigation-ui:2.9.5",
7474
// work_runtime
75-
"androidx.work:work-runtime:2.10.3",
75+
"androidx.work:work-runtime:2.10.5",
7676
// sqlite
77-
"androidx.sqlite:sqlite:2.5.2",
77+
"androidx.sqlite:sqlite:2.6.1",
7878
// palette
7979
"androidx.palette:palette:1.0.0",
8080
// design
@@ -88,9 +88,9 @@ allprojects {
8888
// localbroadcastManager
8989
"androidx.localbroadcastmanager:localbroadcastmanager:1.1.0",
9090
// hilt_android
91-
"com.google.dagger:hilt-android:2.57.1",
91+
"com.google.dagger:hilt-android:2.57.2",
9292
// hilt_android_compiler
93-
"com.google.dagger:hilt-android-compiler:2.57.1",
93+
"com.google.dagger:hilt-android-compiler:2.57.2",
9494
)
9595
}
9696
}

‎file/gradle/config.gradle‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,36 +85,36 @@ ext {
8585
// https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-common-java8
8686
// Lifecycles only ( without ViewModel or LiveData )
8787
// https://developer.android.com/jetpack/androidx/releases/lifecycle
88-
lifecycle_runtime : "androidx.lifecycle:lifecycle-runtime-ktx:2.9.3",
88+
lifecycle_runtime : "androidx.lifecycle:lifecycle-runtime-ktx:2.9.4",
8989
// ViewModel
90-
lifecycle_viewmodel : "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3",
90+
lifecycle_viewmodel : "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4",
9191
// LiveData
92-
lifecycle_livedata : "androidx.lifecycle:lifecycle-livedata-ktx:2.9.3",
92+
lifecycle_livedata : "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4",
9393
// Saved state module for ViewModel
94-
lifecycle_viewmodel_savedstate: "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3",
94+
lifecycle_viewmodel_savedstate: "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4",
9595
// DefaultLifecycleObserver Java8
96-
lifecycle_common_java8 : "androidx.lifecycle:lifecycle-common-java8:2.9.3",
96+
lifecycle_common_java8 : "androidx.lifecycle:lifecycle-common-java8:2.9.4",
9797
// https://mvnrepository.com/artifact/androidx.activity/activity-ktx
9898
// https://developer.android.com/jetpack/androidx/releases/activity
99-
activity : "androidx.activity:activity-ktx:1.11.0-rc01",
99+
activity : "androidx.activity:activity-ktx:1.11.0",
100100
// https://mvnrepository.com/artifact/androidx.fragment/fragment-ktx
101101
fragment : "androidx.fragment:fragment-ktx:1.8.9",
102102
// https://mvnrepository.com/artifact/androidx.navigation/navigation-fragment-ktx
103103
// https://mvnrepository.com/artifact/androidx.navigation/navigation-ui-ktx
104104
// https://developer.android.com/guide/navigation
105105
// https://developer.android.com/jetpack/androidx/releases/navigation
106-
navigation_fragment : "androidx.navigation:navigation-fragment-ktx:2.9.3",
107-
navigation_ui : "androidx.navigation:navigation-ui-ktx:2.9.3",
106+
navigation_fragment : "androidx.navigation:navigation-fragment-ktx:2.9.5",
107+
navigation_ui : "androidx.navigation:navigation-ui-ktx:2.9.5",
108108
// https://mvnrepository.com/artifact/androidx.work/work-runtime-ktx
109109
// WorkManager Kotlin + coroutines
110-
work_runtime : "androidx.work:work-runtime-ktx:2.10.3",
110+
work_runtime : "androidx.work:work-runtime-ktx:2.10.5",
111111
// https://mvnrepository.com/artifact/androidx.room/room-runtime
112112
// https://mvnrepository.com/artifact/androidx.room/room-compiler
113113
// https://mvnrepository.com/artifact/androidx.room/room-ktx
114114
// Room 持久性库 https://developer.android.com/training/data-storage/room
115-
room_runtime : "androidx.room:room-runtime:2.7.2",
116-
room_compiler : "androidx.room:room-compiler:2.7.2",
117-
room : "androidx.room:room-ktx:2.7.2",
115+
room_runtime : "androidx.room:room-runtime:2.8.2",
116+
room_compiler : "androidx.room:room-compiler:2.8.2",
117+
room : "androidx.room:room-ktx:2.8.2",
118118
// https://mvnrepository.com/artifact/androidx.palette/palette-ktx
119119
// Palette 调色板 ( 从图片中获取颜色 )
120120
palette : "androidx.palette:palette-ktx:1.0.0",
@@ -139,20 +139,20 @@ ext {
139139
// https://mvnrepository.com/artifact/androidx.viewpager2/viewpager2
140140
viewpager2 : "androidx.viewpager2:viewpager2:1.1.0",
141141
// https://mvnrepository.com/artifact/androidx.activity/activity
142-
activity : "androidx.activity:activity:1.11.0-rc01",
142+
activity : "androidx.activity:activity:1.11.0",
143143
// https://mvnrepository.com/artifact/androidx.fragment/fragment
144144
fragment : "androidx.fragment:fragment:1.8.9",
145145
// https://mvnrepository.com/artifact/androidx.navigation/navigation-fragment
146146
// https://mvnrepository.com/artifact/androidx.navigation/navigation-ui
147147
// https://developer.android.com/guide/navigation
148148
// https://developer.android.com/jetpack/androidx/releases/navigation
149-
navigation_fragment : "androidx.navigation:navigation-fragment:2.9.3",
150-
navigation_ui : "androidx.navigation:navigation-ui:2.9.3",
149+
navigation_fragment : "androidx.navigation:navigation-fragment:2.9.5",
150+
navigation_ui : "androidx.navigation:navigation-ui:2.9.5",
151151
// https://mvnrepository.com/artifact/androidx.work/work-runtime
152152
// WorkManager Java only
153-
work_runtime : "androidx.work:work-runtime:2.10.3",
153+
work_runtime : "androidx.work:work-runtime:2.10.5",
154154
// https://mvnrepository.com/artifact/androidx.sqlite/sqlite
155-
sqlite : "androidx.sqlite:sqlite:2.5.2", // 推荐使用 Room Jetpack 组件
155+
sqlite : "androidx.sqlite:sqlite:2.6.1", // 推荐使用 Room Jetpack 组件
156156
// https://mvnrepository.com/artifact/androidx.palette/palette
157157
// Palette 调色板 ( 从图片中获取颜色 )
158158
palette : "androidx.palette:palette:1.0.0",
@@ -175,8 +175,8 @@ ext {
175175
// https://mvnrepository.com/artifact/com.google.dagger/hilt-android
176176
// https://mvnrepository.com/artifact/com.google.dagger/hilt-android-compiler
177177
// Hilt 依赖注入 https://developer.android.com/training/dependency-injection/hilt-android
178-
hilt_android : "com.google.dagger:hilt-android:2.57.1",
179-
hilt_android_compiler: "com.google.dagger:hilt-android-compiler:2.57.1",
178+
hilt_android : "com.google.dagger:hilt-android:2.57.2",
179+
hilt_android_compiler: "com.google.dagger:hilt-android-compiler:2.57.2",
180180
],
181181
]
182182
}

0 commit comments

Comments
 (0)