Skip to content

Commit 790710f

Browse files
wintmainwosys
authored andcommitted
[common][chore]Adjust sub-module support
1 parent 50a58c2 commit 790710f

File tree

3 files changed

+46
-3
lines changed

3 files changed

+46
-3
lines changed

app-catalog/app/proguard-rules.pro

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,34 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile
22+
23+
-dontwarn com.google.common.collect.ArrayListMultimap
24+
-dontwarn com.google.common.collect.Multimap
25+
-dontwarn java.awt.Color
26+
-dontwarn java.awt.Font
27+
-dontwarn java.awt.Point
28+
-dontwarn java.awt.Rectangle
29+
-dontwarn javax.money.CurrencyUnit
30+
-dontwarn javax.money.Monetary
31+
-dontwarn javax.ws.rs.Consumes
32+
-dontwarn javax.ws.rs.Produces
33+
-dontwarn javax.ws.rs.core.Response
34+
-dontwarn javax.ws.rs.core.StreamingOutput
35+
-dontwarn javax.ws.rs.ext.MessageBodyReader
36+
-dontwarn javax.ws.rs.ext.MessageBodyWriter
37+
-dontwarn javax.ws.rs.ext.Provider
38+
-dontwarn org.glassfish.jersey.internal.spi.AutoDiscoverable
39+
-dontwarn org.javamoney.moneta.Money
40+
-dontwarn org.joda.time.DateTime
41+
-dontwarn org.joda.time.DateTimeZone
42+
-dontwarn org.joda.time.Duration
43+
-dontwarn org.joda.time.Instant
44+
-dontwarn org.joda.time.LocalDate
45+
-dontwarn org.joda.time.LocalDateTime
46+
-dontwarn org.joda.time.LocalTime
47+
-dontwarn org.joda.time.Period
48+
-dontwarn org.joda.time.ReadablePartial
49+
-dontwarn org.joda.time.format.DateTimeFormat
50+
-dontwarn org.joda.time.format.DateTimeFormatter
51+
-dontwarn springfox.documentation.spring.web.json.Json

app-catalog/samples/wBasis/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
implementation libs.androidx.constraintlayout
2929
implementation libs.androidx.activity.compose
3030
implementation libs.casa.ui
31-
implementation libs.androidx.recyclerviewExt
31+
implementation libs.androidx.recyclerview
3232
implementation libs.androidx.cardview
3333
implementation libs.androidx.navigation.fragment
3434
implementation libs.androidx.navigation.ui

gradle/libs.versions.toml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,20 @@ coil = "2.6.0"
2323
compose-bom = "2025.02.00"
2424
composeCompiler = "1.5.9"
2525
documentfile = "1.0.1"
26+
glide = "4.11.0"
27+
gson = "2.10.1"
2628
kotlin = "1.9.22"
2729
hilt = "2.48.1"
30+
kotlinReflect = "2.0.21"
2831
kotlinxCoroutines = "1.7.3"
32+
kotlinxSerialization = "1.6.3"
2933
ksp = "1.9.22-1.0.17" # Should be updated when kotlin version is updated
3034
coreExt = "1.13.1"
3135
androidx_activity = "1.9.2"
3236
androidx_appcompat = "1.7.0"
3337
androidx_navigation = "2.8.1"
3438
androidx_window = "1.3.0"
39+
legacySupportV4 = "1.0.0"
3540
lifecycleExtensions = "2.2.0"
3641
lifecycleRuntimeKtx = "2.8.7"
3742
multidex = "1.0.3"
@@ -58,6 +63,7 @@ hilt-testing = { group = "com.google.dagger", name = "hilt-android-testing", ver
5863
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
5964
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
6065

66+
androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacySupportV4" }
6167
androidx-activityExt = { group = "androidx.activity", name = "activity", version.ref = "androidx_activity" }
6268
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx_activity" }
6369
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx_appcompat" }
@@ -88,7 +94,7 @@ compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
8894
# 具体的版本号用version = xxx,其他的是 version.ref = xxx
8995
androidx-cardview = "androidx.cardview:cardview:1.0.0"
9096
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
91-
androidx-recyclerviewExt = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.2" }
97+
androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.2" }
9298
# For control over item selection of both touch and mouse driven selection
9399
androidx-recyclerview-selection = "androidx.recyclerview:recyclerview-selection:1.1.0"
94100
androidx-slidingpanelayout = "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
@@ -109,6 +115,8 @@ androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation-ktx:1.0.
109115

110116
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx_navigation" }
111117
androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidx_navigation" }
118+
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx_navigation" }
119+
androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx_navigation" }
112120
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx_navigation" }
113121
androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx_navigation" }
114122
androidx-navigation-dff = { module = "androidx.navigation:navigation-dynamic-features-fragment", version.ref = "androidx_navigation"}
@@ -127,12 +135,17 @@ androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-lived
127135
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleExtensions" }
128136
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
129137
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" }
138+
kotlin-reflect-v2021 = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinReflect" }
130139
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
131140
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
141+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
142+
kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinxSerialization" }
132143
material = "com.google.android.material:material:1.12.0"
133144
accompanist-permissions = "com.google.accompanist:accompanist-permissions:0.32.0"
134145
multidex = { module = "com.android.support:multidex", version.ref = "multidex" }
135146
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
147+
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
148+
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
136149
smartrefreshheader = { module = "com.scwang.smartrefresh:SmartRefreshHeader", version.ref = "smartrefresh" }
137150
smartrefreshlayout = { module = "com.scwang.smartrefresh:SmartRefreshLayout", version.ref = "smartrefresh" }
138151

0 commit comments

Comments
 (0)