Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 02cbcf7

Browse files
Merge pull request #237 from MihaiCristianCondrea/codex/apply-dependency-updates-patch
Adopt plugin catalog aliases and update dependency versions
2 parents 9fee603 + ec8088d commit 02cbcf7

File tree

3 files changed

+72
-44
lines changed

3 files changed

+72
-44
lines changed

‎app/build.gradle‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id 'com.android.application'
3-
id 'com.google.gms.google-services'
4-
id 'com.google.firebase.crashlytics'
5-
id 'com.mikepenz.aboutlibraries.plugin'
6-
id 'com.google.dagger.hilt.android'
2+
alias(libs.plugins.androidApplication)
3+
alias(libs.plugins.googleServices)
4+
alias(libs.plugins.firebaseCrashlytics)
5+
alias(libs.plugins.aboutLibraries)
6+
alias(libs.plugins.hiltAndroid)
77
}
88

99
android {
@@ -103,8 +103,5 @@ dependencies {
103103

104104

105105
// Testing
106-
testImplementation libs.junit
107-
testImplementation libs.androidx.core.testing
108-
testImplementation libs.mockito.core
109-
testImplementation libs.mockito.inline
110-
}
106+
testImplementation libs.bundles.unitTest
107+
}

‎build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
2-
id 'com.android.application' version '8.13.0' apply false
3-
id 'com.google.gms.google-services' version '4.4.3' apply false
4-
id 'com.google.firebase.crashlytics' version '3.0.6' apply false
5-
//noinspection NewerVersionAvailable
6-
id 'com.mikepenz.aboutlibraries.plugin' version '11.3.0' apply true
7-
id 'com.google.dagger.hilt.android' version '2.57.1' apply false
2+
alias(libs.plugins.androidApplication) apply false
3+
alias(libs.plugins.googleServices) apply false
4+
alias(libs.plugins.firebaseCrashlytics) apply false
5+
alias(libs.plugins.aboutLibraries) apply true
6+
alias(libs.plugins.hiltAndroid) apply false
87
}

‎gradle/libs.versions.toml‎

Lines changed: 60 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
[versions]
1+
[versions]
2+
agp = "8.13.0"
3+
firebaseCrashlyticsPlugin = "3.0.6"
4+
googleServices = "4.4.3"
25
appcompat = "1.7.1"
36
appUpdate = "2.1.0"
47
billing = "8.0.0"
58
constraintlayout = "2.2.1"
6-
#noinspection NewerVersionAvailable,GradleDependency
79
aboutlibraries = "11.3.0"
810
coreSplashscreen = "1.0.1"
911
core = "4.6.2"
@@ -13,8 +15,8 @@ gridlayout = "1.1.0"
1315
junit = "4.13.2"
1416
library = "1.3.0"
1517
libraryVersion = "1.4.0"
16-
lifecycle = "2.9.3"
17-
lottie = "6.6.7"
18+
lifecycle = "2.9.4"
19+
lottie = "6.6.9"
1820
mockitoCore = "5.19.0"
1921
mockitoInline = "5.2.0"
2022
navigationUi = "2.9.4"
@@ -28,48 +30,78 @@ playServicesAds = "24.6.0"
2830
codeview = "1.3.9"
2931
hilt = "2.57.1"
3032
room = "2.8.0"
31-
glide = "5.0.4"
33+
glide = "5.0.5"
3234
retrofit = "3.0.0"
3335

3436
[libraries]
35-
aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibraries" }
37+
# AndroidX & Material
3638
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
3739
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
3840
androidx-core = { module = "androidx.core:core", version.ref = "coreKtx" }
3941
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
40-
androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
4142
androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "gridlayout" }
42-
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata", version.ref = "lifecycle" }
43-
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
44-
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "lifecycle" }
45-
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
4643
androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
4744
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "navigationUi" }
4845
androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
4946
androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "navigationUi" }
50-
app-update = { module = "com.google.android.play:app-update", version.ref = "appUpdate" }
51-
billing = { module = "com.android.billingclient:billing", version.ref = "billing" }
47+
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
48+
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
49+
material = { module = "com.google.android.material:material", version.ref = "material" }
50+
materialratingbar-library = { module = "me.zhanghai.android.materialratingbar:library", version.ref = "libraryVersion" }
51+
library = { module = "me.zhanghai.android.fastscroll:library", version.ref = "library" }
52+
codeview = { module = "io.github.amrdeveloper:codeview", version.ref = "codeview" }
53+
54+
# Lifecycle
55+
androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata", version.ref = "lifecycle" }
56+
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
57+
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "lifecycle" }
58+
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
59+
60+
# Firebase & Play Services
5261
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
5362
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
5463
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
55-
core = { module = "io.noties.markwon:core", version.ref = "core" }
5664
google-firebase-perf = { module = "com.google.firebase:firebase-perf" }
57-
junit = { module = "junit:junit", version.ref = "junit" }
58-
library = { module = "me.zhanghai.android.fastscroll:library", version.ref = "library" }
59-
lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
60-
material = { module = "com.google.android.material:material", version.ref = "material" }
61-
materialratingbar-library = { module = "me.zhanghai.android.materialratingbar:library", version.ref = "libraryVersion" }
62-
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
63-
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
6465
play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "playServicesAds" }
65-
review = { module = "com.google.android.play:review", version.ref = "review" }
66-
volley = { module = "com.android.volley:volley", version.ref = "volley" }
67-
codeview = { module = "io.github.amrdeveloper:codeview", version.ref = "codeview" }
66+
67+
# Networking (Retrofit)
68+
retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
69+
retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
70+
71+
# DI (Hilt)
6872
hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
6973
hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
70-
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
71-
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
74+
75+
# Utility
76+
aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibraries" }
77+
app-update = { module = "com.google.android.play:app-update", version.ref = "appUpdate" }
78+
billing = { module = "com.android.billingclient:billing", version.ref = "billing" }
79+
core = { module = "io.noties.markwon:core", version.ref = "core" }
80+
lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
81+
review = { module = "com.google.android.play:review", version.ref = "review" }
82+
volley = { module = "com.android.volley:volley", version.ref = "volley" }
7283
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
7384
glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
74-
retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
75-
retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
85+
86+
# --- TESTING ---
87+
# Unit Tests (test folder)
88+
junit = { module = "junit:junit", version.ref = "junit" }
89+
androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
90+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
91+
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
92+
93+
[plugins]
94+
androidApplication = { id = "com.android.application", version.ref = "agp" }
95+
googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
96+
firebaseCrashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
97+
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
98+
hiltAndroid = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
99+
100+
[bundles]
101+
# For local tests on the JVM (test sourceSet)
102+
unitTest = [
103+
"junit",
104+
"androidx-core-testing",
105+
"mockito-core",
106+
"mockito-inline",
107+
]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /