From dc2e4af77bf7ad54330d3e4a6e4a9de2b1183f56 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Tue, 26 Sep 2023 13:53:07 +0300 Subject: [PATCH] Update dependency namings --- app/build.gradle.kts | 12 +-- .../src/main/java/UnittoHiltPlugin.kt | 8 +- .../main/java/UnittoLibraryComposePlugin.kt | 2 +- .../main/java/UnittoLibraryFeaturePlugin.kt | 2 +- .../src/main/java/UnittoLibraryPlugin.kt | 2 +- .../sadellie/unitto/ConfigureKotlinAndroid.kt | 2 +- core/ui/build.gradle.kts | 6 +- data/common/build.gradle.kts | 6 +- data/epoch/build.gradle.kts | 2 +- data/evaluatto/build.gradle.kts | 2 +- data/units/build.gradle.kts | 15 ++- data/userprefs/build.gradle.kts | 2 +- feature/calculator/build.gradle.kts | 4 +- feature/converter/build.gradle.kts | 12 +-- feature/datecalculator/build.gradle.kts | 2 +- feature/settings/build.gradle.kts | 4 +- feature/timezone/build.gradle.kts | 4 +- gradle/libs.versions.toml | 94 +++++++++---------- 18 files changed, 88 insertions(+), 93 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e41f065f..d3759177 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -104,16 +104,16 @@ tasks.withType().configureEach } dependencies { - implementation(libs.androidx.core) - coreLibraryDesugaring(libs.android.desugarJdkLibs) + implementation(libs.androidx.core.core.ktx) + coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs) implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material.icons.extended) - implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.lifecycle.runtime.compose) implementation(libs.com.github.sadellie.themmo) - implementation(libs.com.google.accompanist.systemuicontroller) - implementation(libs.androidx.datastore) - implementation(libs.androidx.appcompat) + implementation(libs.com.google.accompanist.accompanist.systemuicontroller) + implementation(libs.androidx.datastore.datastore.preferences) + implementation(libs.androidx.appcompat.appcompat) implementation(project(":feature:converter")) implementation(project(":feature:calculator")) diff --git a/build-logic/convention/src/main/java/UnittoHiltPlugin.kt b/build-logic/convention/src/main/java/UnittoHiltPlugin.kt index be0545f1..3ff33948 100644 --- a/build-logic/convention/src/main/java/UnittoHiltPlugin.kt +++ b/build-logic/convention/src/main/java/UnittoHiltPlugin.kt @@ -32,10 +32,10 @@ class UnittoHiltPlugin : Plugin { } val libs = extensions.getByType().named("libs") dependencies { - "implementation"(libs.findLibrary("androidx.hilt").get()) - "implementation"(libs.findLibrary("com.google.dagger.android").get()) - "kapt"(libs.findLibrary("com.google.dagger.processor").get()) - "kapt"(libs.findLibrary("com.google.dagger.compiler").get()) + "implementation"(libs.findLibrary("androidx.hilt.hilt.navigation.compose").get()) + "implementation"(libs.findLibrary("com.google.dagger.android.hilt.android").get()) + "kapt"(libs.findLibrary("com.google.dagger.dagger.android.processor").get()) + "kapt"(libs.findLibrary("com.google.dagger.hilt.compiler").get()) } } } diff --git a/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt index d7670ac2..26953b4f 100644 --- a/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt +++ b/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt @@ -36,7 +36,7 @@ class UnittoLibraryComposePlugin : Plugin { val libs = extensions.getByType().named("libs") dependencies { "implementation"(libs.findLibrary("androidx.compose.material3").get()) - "implementation"(libs.findLibrary("androidx.lifecycle.runtime.compose").get()) + "implementation"(libs.findLibrary("androidx.lifecycle.lifecycle.runtime.compose").get()) "implementation"(libs.findLibrary("androidx.compose.material.icons.extended").get()) "implementation"(libs.findLibrary("androidx.compose.ui.tooling").get()) "implementation"(libs.findLibrary("androidx.compose.ui.tooling.preview").get()) diff --git a/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt index 41bf1962..dec1f270 100644 --- a/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt +++ b/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt @@ -28,7 +28,7 @@ class UnittoLibraryFeaturePlugin : Plugin { with(target) { val libs = extensions.getByType().named("libs") dependencies { - "implementation"(libs.findLibrary("androidx.navigation").get()) + "implementation"(libs.findLibrary("androidx.navigation.navigation.compose").get()) "implementation"(project(":core:base")) "implementation"(project(":core:ui")) diff --git a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt index b0189e6c..f06714f3 100644 --- a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt +++ b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt @@ -43,7 +43,7 @@ class UnittoLibraryPlugin : Plugin { val libs = extensions.getByType().named("libs") dependencies { - "implementation"(libs.findLibrary("androidx.core").get()) + "implementation"(libs.findLibrary("androidx.core.core.ktx").get()) } } } diff --git a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt index 52c8d784..a417f4c3 100644 --- a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt +++ b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt @@ -89,7 +89,7 @@ internal fun Project.configureKotlinAndroid( val libs = extensions.getByType().named("libs") dependencies { - add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get()) + add("coreLibraryDesugaring", libs.findLibrary("com.android.tools.desugar.jdk.libs").get()) } } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index c697c86f..e126ca56 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -36,12 +36,12 @@ android { } dependencies { - testImplementation(libs.junit) - testImplementation(libs.org.robolectric) + testImplementation(libs.junit.junit) + testImplementation(libs.org.robolectric.robolectric) testImplementation(libs.androidx.compose.ui.test.junit4) debugImplementation(libs.androidx.compose.ui.test.manifest) - implementation(libs.androidx.navigation) + implementation(libs.androidx.navigation.navigation.compose) implementation(project(":core:base")) } diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts index 00c02c8d..eda1e259 100644 --- a/data/common/build.gradle.kts +++ b/data/common/build.gradle.kts @@ -25,8 +25,8 @@ android { } dependencies { - implementation(libs.androidx.core) - implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.core.core.ktx) + implementation(libs.androidx.lifecycle.lifecycle.runtime.compose) implementation(project(":core:base")) - testImplementation(libs.junit) + testImplementation(libs.junit.junit) } \ No newline at end of file diff --git a/data/epoch/build.gradle.kts b/data/epoch/build.gradle.kts index 387eed23..a342257c 100644 --- a/data/epoch/build.gradle.kts +++ b/data/epoch/build.gradle.kts @@ -26,5 +26,5 @@ android { } dependencies { - testImplementation(libs.junit) + testImplementation(libs.junit.junit) } diff --git a/data/evaluatto/build.gradle.kts b/data/evaluatto/build.gradle.kts index 5428162c..ab006f96 100644 --- a/data/evaluatto/build.gradle.kts +++ b/data/evaluatto/build.gradle.kts @@ -27,5 +27,5 @@ android { dependencies { implementation(project(":core:base")) - testImplementation(libs.junit) + testImplementation(libs.junit.junit) } diff --git a/data/units/build.gradle.kts b/data/units/build.gradle.kts index 81f59ffd..65bd474d 100644 --- a/data/units/build.gradle.kts +++ b/data/units/build.gradle.kts @@ -35,17 +35,14 @@ android { } dependencies { - testImplementation(libs.junit) - testImplementation(libs.org.robolectric) + testImplementation(libs.junit.junit) + testImplementation(libs.org.robolectric.robolectric) - implementation(libs.androidx.lifecycle.runtime.compose) - implementation(libs.androidx.datastore) + implementation(libs.androidx.lifecycle.lifecycle.runtime.compose) + implementation(libs.androidx.datastore.datastore.preferences) - implementation(libs.com.squareup.moshi) - implementation(libs.com.squareup.retrofit2) - - implementation(libs.org.burnoutcrew.composereorderable) - implementation(libs.com.github.sadellie.themmo) + implementation(libs.com.squareup.moshi.moshi.kotlin) + implementation(libs.com.squareup.retrofit2.converter.moshi) implementation(project(":core:base")) implementation(project(":data:database")) diff --git a/data/userprefs/build.gradle.kts b/data/userprefs/build.gradle.kts index 54216ba6..4c38ed40 100644 --- a/data/userprefs/build.gradle.kts +++ b/data/userprefs/build.gradle.kts @@ -26,7 +26,7 @@ android { } dependencies { - implementation(libs.androidx.datastore) + implementation(libs.androidx.datastore.datastore.preferences) implementation(libs.com.github.sadellie.themmo) implementation(project(":core:base")) diff --git a/feature/calculator/build.gradle.kts b/feature/calculator/build.gradle.kts index 32c84c63..905cabfd 100644 --- a/feature/calculator/build.gradle.kts +++ b/feature/calculator/build.gradle.kts @@ -29,8 +29,8 @@ android { } dependencies { - testImplementation(libs.junit) - testImplementation(libs.org.robolectric) + testImplementation(libs.junit.junit) + testImplementation(libs.org.robolectric.robolectric) androidTestImplementation(libs.androidx.compose.ui.test.junit4) debugImplementation(libs.androidx.compose.ui.test.manifest) diff --git a/feature/converter/build.gradle.kts b/feature/converter/build.gradle.kts index e91d4ec4..85849fd1 100644 --- a/feature/converter/build.gradle.kts +++ b/feature/converter/build.gradle.kts @@ -30,16 +30,16 @@ android { } dependencies { - testImplementation(libs.junit) - testImplementation(libs.org.robolectric) - testImplementation(libs.org.jetbrains.kotlinx.coroutines.test) + testImplementation(libs.junit.junit) + testImplementation(libs.org.robolectric.robolectric) + testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test) testImplementation(libs.androidx.room.runtime) testImplementation(libs.androidx.room.ktx) kapt(libs.androidx.room.compiler) - testImplementation(libs.androidx.datastore) + testImplementation(libs.androidx.datastore.datastore.preferences) - implementation(libs.com.squareup.moshi) - implementation(libs.com.squareup.retrofit2) + implementation(libs.com.squareup.moshi.moshi.kotlin) + implementation(libs.com.squareup.retrofit2.converter.moshi) implementation(project(":data:common")) implementation(project(":data:database")) diff --git a/feature/datecalculator/build.gradle.kts b/feature/datecalculator/build.gradle.kts index 676d80d9..3a53ce37 100644 --- a/feature/datecalculator/build.gradle.kts +++ b/feature/datecalculator/build.gradle.kts @@ -28,7 +28,7 @@ android { } dependencies { - testImplementation(libs.junit) + testImplementation(libs.junit.junit) implementation(project(":data:userprefs")) } diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 632dc0d1..b122979e 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -29,8 +29,8 @@ android { dependencies { implementation(libs.com.github.sadellie.themmo) - implementation(libs.org.burnoutcrew.composereorderable) - implementation(libs.androidx.appcompat) + implementation(libs.org.burnoutcrew.composereorderable.reorderable) + implementation(libs.androidx.appcompat.appcompat) implementation(project(":data:common")) implementation(project(":data:model")) diff --git a/feature/timezone/build.gradle.kts b/feature/timezone/build.gradle.kts index a17fbfdb..a1603106 100644 --- a/feature/timezone/build.gradle.kts +++ b/feature/timezone/build.gradle.kts @@ -28,9 +28,9 @@ android { } dependencies { - testImplementation(libs.junit) + testImplementation(libs.junit.junit) implementation(libs.com.github.sadellie.themmo) - implementation(libs.org.burnoutcrew.composereorderable) + implementation(libs.org.burnoutcrew.composereorderable.reorderable) implementation(project(":data:common")) implementation(project(":data:userprefs")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36304a6c..6e6b1386 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,69 +1,67 @@ [versions] appCode = "25" appName = "Nadeshiko Pink" -kotlin = "1.9.0" -ksp = "1.9.0-1.0.13" -androidxCore = "1.12.0" + androidGradlePlugin = "8.1.1" -orgJetbrainsKotlinxCoroutinesTest = "1.7.2" +androidxAppCompatAppCompat = "1.6.1" androidxCompose = "1.6.0-alpha06" androidxComposeCompiler = "1.5.0" -androidxComposeUi = "1.6.0-alpha06" androidxComposeMaterial3 = "1.2.0-alpha08" -androidxNavigation = "2.7.3" -androidxLifecycleRuntimeCompose = "2.6.2" -androidxHilt = "1.0.0" -androidxAppCompat = "1.6.1" -comGoogleDagger = "2.47" -androidxComposeMaterialIconsExtended = "1.6.0-alpha06" -androidxDatastore = "1.0.0" -comGoogleAccompanist = "0.30.1" +androidxCoreCoreKts = "1.12.0" +androidxDatastoreDatastorePreferences = "1.0.0" +androidxHiltHiltNavigationCompose = "1.0.0" +androidxLifecycleLifecycleRuntimeCompose = "2.6.2" +androidxNavigationNavigationCompose = "2.7.3" androidxRoom = "2.6.0-rc01" -comSquareupMoshi = "1.15.0" -comSquareupRetrofit2 = "2.9.0" -comGithubSadellieThemmo = "1.0.0" -orgBurnoutcrewComposereorderable = "0.9.6" -junit = "4.13.2" androidxTest = "1.5.0" -androidxTestExt = "1.1.5" -androidDesugarJdkLibs = "2.0.3" +androidxTestExtJunitKtx = "1.1.5" androidxTestRunner = "1.5.2" -androidxTestRules = "1.5.0" -orgRobolectric = "4.10.3" +comAndroidToolsDesugarJdkLibs = "2.0.3" +comGithubSadellieThemmo = "1.0.0" +comGoogleAccompanistAccompanistSystemuicontroller = "0.30.1" +comGoogleDagger = "2.47" +comSquareupMoshiMoshiKotlin = "1.15.0" +comSquareupRetrofit2ConverterMoshi = "2.9.0" +junitJunit = "4.13.2" +kotlin = "1.9.0" +ksp = "1.9.0-1.0.13" +orgBurnoutcrewComposereorderableReorderable = "0.9.6" +orgJetbrainsKotlinxKotlinxCoroutinesTest = "1.7.2" +orgRobolectricRobolectric = "4.10.3" [libraries] -androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } -androidx-test = { group = "androidx.test", name = "core", version.ref = "androidxTest" } -androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" } -junit = { group = "junit", name = "junit", version.ref = "junit" } -androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } -androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" } -org-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "orgRobolectric" } -org-jetbrains-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "orgJetbrainsKotlinxCoroutinesTest" } -androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxComposeUi" } -androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxComposeUi" } -androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxComposeUi" } +androidx-appcompat-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompatAppCompat" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxCompose" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxCompose" } androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxCompose" } androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "androidxCompose" } -androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleRuntimeCompose" } -androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } -androidx-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHilt" } -com-google-dagger-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "comGoogleDagger" } -com-google-dagger-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" } -com-google-dagger-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "comGoogleDagger" } -androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxComposeMaterialIconsExtended" } -androidx-datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastore" } -com-google-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "comGoogleAccompanist" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxCompose" } +androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" } +androidx-core-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreCoreKts" } +androidx-datastore-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastoreDatastorePreferences" } +androidx-hilt-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltHiltNavigationCompose" } +androidx-lifecycle-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleLifecycleRuntimeCompose" } +androidx-navigation-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigationNavigationCompose" } androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidxRoom" } androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidxRoom" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidxRoom" } -com-squareup-moshi = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "comSquareupMoshi" } -com-squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "comSquareupRetrofit2" } +androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTest" } +androidx-test-ext-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExtJunitKtx" } +androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } +androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" } +com-android-tools-desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "comAndroidToolsDesugarJdkLibs" } com-github-sadellie-themmo = { group = "com.github.sadellie", name = "themmo", version.ref = "comGithubSadellieThemmo" } -org-burnoutcrew-composereorderable = { group = "org.burnoutcrew.composereorderable", name = "reorderable", version.ref = "orgBurnoutcrewComposereorderable" } -android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } +com-google-accompanist-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "comGoogleAccompanistAccompanistSystemuicontroller" } +com-google-dagger-android-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" } +com-google-dagger-dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "comGoogleDagger" } +com-google-dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "comGoogleDagger" } +com-squareup-moshi-moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "comSquareupMoshiMoshiKotlin" } +com-squareup-retrofit2-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "comSquareupRetrofit2ConverterMoshi" } +junit-junit = { group = "junit", name = "junit", version.ref = "junitJunit" } +org-burnoutcrew-composereorderable-reorderable = { group = "org.burnoutcrew.composereorderable", name = "reorderable", version.ref = "orgBurnoutcrewComposereorderableReorderable" } +org-jetbrains-kotlinx-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "orgJetbrainsKotlinxKotlinxCoroutinesTest" } +org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "orgRobolectricRobolectric" } # classpath android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }