refactor: Bundle androidx

This commit is contained in:
Ahmad Ansori Palembani 2024-05-31 06:02:38 +07:00
parent e49e4f2895
commit 579484eba4
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
4 changed files with 21 additions and 39 deletions

View file

@ -146,12 +146,10 @@ android {
dependencies {
// Compose
implementation(androidx.activity.compose)
implementation(compose.bundles.compose)
debugImplementation(compose.ui.tooling)
implementation(libs.compose.theme.adapter3)
implementation(libs.accompanist.webview)
implementation(androidx.glance.appwidget)
// Modified dependencies
implementation(libs.subsamplingscaleimageview) {
@ -159,40 +157,18 @@ dependencies {
}
implementation(libs.image.decoder)
// Android X libraries
implementation(androidx.appcompat)
implementation(androidx.cardview)
implementation(libs.material)
implementation(androidx.webkit)
implementation(androidx.recyclerview)
implementation(androidx.preference)
implementation(androidx.annotation)
implementation(androidx.browser)
implementation(androidx.biometric)
implementation(androidx.palette)
implementation(androidx.activity)
implementation(androidx.core)
implementation(androidx.core.splashscreen)
implementation(libs.flexbox)
implementation(androidx.window)
implementation(androidx.swiperefreshlayout)
implementation(androidx.constraintlayout)
implementation(libs.material)
implementation(androidx.multidex)
// Android X libraries
implementation(androidx.bundles.androidx)
implementation(platform(libs.firebase))
implementation(libs.firebase.analytics)
implementation(libs.firebase.crashlytics)
implementation(androidx.lifecycle.viewmodel)
implementation(compose.lifecycle.viewmodel)
implementation(androidx.lifecycle.livedata)
implementation(androidx.lifecycle.common)
implementation(androidx.lifecycle.process)
implementation(androidx.lifecycle.runtime)
// ReactiveX
implementation(libs.rxandroid)
implementation(libs.rxjava)
@ -227,13 +203,11 @@ dependencies {
implementation(libs.jsoup)
// Job scheduling
implementation(androidx.work)
implementation(libs.guava)
implementation(libs.play.services.gcm)
// Database
implementation(androidx.sqlite)
implementation(libs.sqlite.android)
//noinspection UseTomlInstead
implementation("com.github.inorichi.storio:storio-common:8be19de@aar")
@ -299,7 +273,7 @@ dependencies {
// Tests
testImplementation(libs.bundles.test)
testRuntimeOnly(libs.bundles.test.runtime)
androidTestImplementation(libs.junit.android)
androidTestImplementation(libs.bundles.test.android)
}
tasks {

View file

@ -1,30 +1,39 @@
[versions]
activity = "1.9.0"
lifecycle = "2.8.0"
lifecycle = "2.8.1"
[libraries]
activity = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
annotation = { module = "androidx.annotation:annotation", version = "1.8.0" }
appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
browser = { module = "androidx.browser:browser", version = "1.8.0" }
biometric = { module = "androidx.biometric:biometric", version = "1.1.0" }
cardview = { module = "androidx.cardview:cardview", version = "1.0.0" }
core = { module = "androidx.core:core-ktx", version = "1.13.1" }
core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" }
glance-appwidget = { module = "androidx.glance:glance-appwidget", version = "1.0.0" }
lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
layout-constraint = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" }
layout-swiperefresh = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
multidex = { module = "androidx.multidex:multidex", version = "2.0.1" }
palette = { module = "androidx.palette:palette", version = "1.0.0" }
preference = { module = "androidx.preference:preference-ktx", version = "1.2.1" }
recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.3.2" }
sqlite = { module = "androidx.sqlite:sqlite", version = "2.4.0" }
swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
webkit = { module = "androidx.webkit:webkit", version = "1.11.0" }
work = { module = "androidx.work:work-runtime-ktx", version = "2.9.0" }
window = { module = "androidx.window:window", version = "1.2.0" }
window = { module = "androidx.window:window", version = "1.3.0" }
[bundles]
androidx = [
"activity", "activity-compose", "annotation", "appcompat", "browser", "biometric", "cardview", "core",
"core-splashscreen", "layout-constraint", "glance-appwidget", "lifecycle-common", "lifecycle-livedata",
"lifecycle-process", "lifecycle-runtime", "lifecycle-viewmodel", "lifecycle-viewmodel-compose", "multidex",
"palette", "preference", "recyclerview", "sqlite", "layout-swiperefresh", "webkit", "work", "window"
]

View file

@ -1,7 +1,6 @@
[versions]
compose = "1.6.7"
compose-compiler = "1.5.14"
lifecycle = "2.8.0"
[libraries]
animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
@ -9,7 +8,6 @@ foundation = { module = "androidx.compose.foundation:foundation", version.ref =
material = { module = "androidx.compose.material:material", version.ref = "compose" }
material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
material-motion = { module = "io.github.fornewid:material-motion-compose-core", version = "1.0.7" }
lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }

View file

@ -84,4 +84,5 @@ gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
archive = [ "common-compress", "junrar" ]
coil = [ "coil3", "coil3-svg", "coil3-gif", "coil3-okhttp" ]
test = [ "junit-api", "mockk" ]
test-android = [ "junit-android" ]
test-runtime = [ "junit-engine" ]