Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-18 16:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency namings

Browse Source
This commit is contained in:
Sad Ellie 2023-09-26 13:53:07 +03:00
parent e821f26ad9
commit dc2e4af77b
18 changed files with 88 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle.kts
View File

@ -104,16 +104,16 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
} }
dependencies { dependencies {
implementation(libs.androidx.core) implementation(libs.androidx.core.core.ktx)
coreLibraryDesugaring(libs.android.desugarJdkLibs) coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs)
implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.material.icons.extended) 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.github.sadellie.themmo)
implementation(libs.com.google.accompanist.systemuicontroller) implementation(libs.com.google.accompanist.accompanist.systemuicontroller)
implementation(libs.androidx.datastore) implementation(libs.androidx.datastore.datastore.preferences)
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat.appcompat)
implementation(project(":feature:converter")) implementation(project(":feature:converter"))
implementation(project(":feature:calculator")) implementation(project(":feature:calculator"))

8
build-logic/convention/src/main/java/UnittoHiltPlugin.kt
View File

@ -32,10 +32,10 @@ class UnittoHiltPlugin : Plugin<Project> {
} }
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs") val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies { dependencies {
"implementation"(libs.findLibrary("androidx.hilt").get()) "implementation"(libs.findLibrary("androidx.hilt.hilt.navigation.compose").get())
"implementation"(libs.findLibrary("com.google.dagger.android").get()) "implementation"(libs.findLibrary("com.google.dagger.android.hilt.android").get())
"kapt"(libs.findLibrary("com.google.dagger.processor").get()) "kapt"(libs.findLibrary("com.google.dagger.dagger.android.processor").get())
"kapt"(libs.findLibrary("com.google.dagger.compiler").get()) "kapt"(libs.findLibrary("com.google.dagger.hilt.compiler").get())
} }
} }
} }

2
build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
View File

@ -36,7 +36,7 @@ class UnittoLibraryComposePlugin : Plugin<Project> {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs") val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies { dependencies {
"implementation"(libs.findLibrary("androidx.compose.material3").get()) "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.material.icons.extended").get())
"implementation"(libs.findLibrary("androidx.compose.ui.tooling").get()) "implementation"(libs.findLibrary("androidx.compose.ui.tooling").get())
"implementation"(libs.findLibrary("androidx.compose.ui.tooling.preview").get()) "implementation"(libs.findLibrary("androidx.compose.ui.tooling.preview").get())

2
build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt
View File

@ -28,7 +28,7 @@ class UnittoLibraryFeaturePlugin : Plugin<Project> {
with(target) { with(target) {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs") val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies { dependencies {
"implementation"(libs.findLibrary("androidx.navigation").get()) "implementation"(libs.findLibrary("androidx.navigation.navigation.compose").get())
"implementation"(project(":core:base")) "implementation"(project(":core:base"))
"implementation"(project(":core:ui")) "implementation"(project(":core:ui"))

2
build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
View File

@ -43,7 +43,7 @@ class UnittoLibraryPlugin : Plugin<Project> {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs") val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies { dependencies {
"implementation"(libs.findLibrary("androidx.core").get()) "implementation"(libs.findLibrary("androidx.core.core.ktx").get())
} }
} }
} }

2
build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt
View File

@ -89,7 +89,7 @@ internal fun Project.configureKotlinAndroid(
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs") val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependencies { dependencies {
add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get()) add("coreLibraryDesugaring", libs.findLibrary("com.android.tools.desugar.jdk.libs").get())
} }
} }

6
core/ui/build.gradle.kts
View File

@ -36,12 +36,12 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
testImplementation(libs.org.robolectric) testImplementation(libs.org.robolectric.robolectric)
testImplementation(libs.androidx.compose.ui.test.junit4) testImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.test.manifest)
implementation(libs.androidx.navigation) implementation(libs.androidx.navigation.navigation.compose)
implementation(project(":core:base")) implementation(project(":core:base"))
} }

6
data/common/build.gradle.kts
View File

@ -25,8 +25,8 @@ android {
} }
dependencies { dependencies {
implementation(libs.androidx.core) implementation(libs.androidx.core.core.ktx)
implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
implementation(project(":core:base")) implementation(project(":core:base"))
testImplementation(libs.junit) testImplementation(libs.junit.junit)
} }

2
data/epoch/build.gradle.kts
View File

@ -26,5 +26,5 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
} }

2
data/evaluatto/build.gradle.kts
View File

@ -27,5 +27,5 @@ android {
dependencies { dependencies {
implementation(project(":core:base")) implementation(project(":core:base"))
testImplementation(libs.junit) testImplementation(libs.junit.junit)
} }

15
data/units/build.gradle.kts
View File

@ -35,17 +35,14 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
testImplementation(libs.org.robolectric) testImplementation(libs.org.robolectric.robolectric)
implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
implementation(libs.androidx.datastore) implementation(libs.androidx.datastore.datastore.preferences)
implementation(libs.com.squareup.moshi) implementation(libs.com.squareup.moshi.moshi.kotlin)
implementation(libs.com.squareup.retrofit2) implementation(libs.com.squareup.retrofit2.converter.moshi)
implementation(libs.org.burnoutcrew.composereorderable)
implementation(libs.com.github.sadellie.themmo)
implementation(project(":core:base")) implementation(project(":core:base"))
implementation(project(":data:database")) implementation(project(":data:database"))

2
data/userprefs/build.gradle.kts
View File

@ -26,7 +26,7 @@ android {
} }
dependencies { dependencies {
implementation(libs.androidx.datastore) implementation(libs.androidx.datastore.datastore.preferences)
implementation(libs.com.github.sadellie.themmo) implementation(libs.com.github.sadellie.themmo)
implementation(project(":core:base")) implementation(project(":core:base"))

4
feature/calculator/build.gradle.kts
View File

@ -29,8 +29,8 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
testImplementation(libs.org.robolectric) testImplementation(libs.org.robolectric.robolectric)
androidTestImplementation(libs.androidx.compose.ui.test.junit4) androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.test.manifest)

12
feature/converter/build.gradle.kts
View File

@ -30,16 +30,16 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
testImplementation(libs.org.robolectric) testImplementation(libs.org.robolectric.robolectric)
testImplementation(libs.org.jetbrains.kotlinx.coroutines.test) testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)
testImplementation(libs.androidx.room.runtime) testImplementation(libs.androidx.room.runtime)
testImplementation(libs.androidx.room.ktx) testImplementation(libs.androidx.room.ktx)
kapt(libs.androidx.room.compiler) kapt(libs.androidx.room.compiler)
testImplementation(libs.androidx.datastore) testImplementation(libs.androidx.datastore.datastore.preferences)
implementation(libs.com.squareup.moshi) implementation(libs.com.squareup.moshi.moshi.kotlin)
implementation(libs.com.squareup.retrofit2) implementation(libs.com.squareup.retrofit2.converter.moshi)
implementation(project(":data:common")) implementation(project(":data:common"))
implementation(project(":data:database")) implementation(project(":data:database"))

2
feature/datecalculator/build.gradle.kts
View File

@ -28,7 +28,7 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
implementation(project(":data:userprefs")) implementation(project(":data:userprefs"))
} }

4
feature/settings/build.gradle.kts
View File

@ -29,8 +29,8 @@ android {
dependencies { dependencies {
implementation(libs.com.github.sadellie.themmo) implementation(libs.com.github.sadellie.themmo)
implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.org.burnoutcrew.composereorderable.reorderable)
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat.appcompat)
implementation(project(":data:common")) implementation(project(":data:common"))
implementation(project(":data:model")) implementation(project(":data:model"))

4
feature/timezone/build.gradle.kts
View File

@ -28,9 +28,9 @@ android {
} }
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit.junit)
implementation(libs.com.github.sadellie.themmo) implementation(libs.com.github.sadellie.themmo)
implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.org.burnoutcrew.composereorderable.reorderable)
implementation(project(":data:common")) implementation(project(":data:common"))
implementation(project(":data:userprefs")) implementation(project(":data:userprefs"))

94
gradle/libs.versions.toml
View File

@ -1,69 +1,67 @@
[versions] [versions]
appCode = "25" appCode = "25"
appName = "Nadeshiko Pink" appName = "Nadeshiko Pink"
kotlin = "1.9.0"
ksp = "1.9.0-1.0.13"
androidxCore = "1.12.0"
androidGradlePlugin = "8.1.1" androidGradlePlugin = "8.1.1"
orgJetbrainsKotlinxCoroutinesTest = "1.7.2" androidxAppCompatAppCompat = "1.6.1"
androidxCompose = "1.6.0-alpha06" androidxCompose = "1.6.0-alpha06"
androidxComposeCompiler = "1.5.0" androidxComposeCompiler = "1.5.0"
androidxComposeUi = "1.6.0-alpha06"
androidxComposeMaterial3 = "1.2.0-alpha08" androidxComposeMaterial3 = "1.2.0-alpha08"
androidxNavigation = "2.7.3" androidxCoreCoreKts = "1.12.0"
androidxLifecycleRuntimeCompose = "2.6.2" androidxDatastoreDatastorePreferences = "1.0.0"
androidxHilt = "1.0.0" androidxHiltHiltNavigationCompose = "1.0.0"
androidxAppCompat = "1.6.1" androidxLifecycleLifecycleRuntimeCompose = "2.6.2"
comGoogleDagger = "2.47" androidxNavigationNavigationCompose = "2.7.3"
androidxComposeMaterialIconsExtended = "1.6.0-alpha06"
androidxDatastore = "1.0.0"
comGoogleAccompanist = "0.30.1"
androidxRoom = "2.6.0-rc01" 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" androidxTest = "1.5.0"
androidxTestExt = "1.1.5" androidxTestExtJunitKtx = "1.1.5"
androidDesugarJdkLibs = "2.0.3"
androidxTestRunner = "1.5.2" androidxTestRunner = "1.5.2"
androidxTestRules = "1.5.0" comAndroidToolsDesugarJdkLibs = "2.0.3"
orgRobolectric = "4.10.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] [libraries]
androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } androidx-appcompat-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompatAppCompat" }
androidx-test = { group = "androidx.test", name = "core", version.ref = "androidxTest" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" } androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxCompose" }
junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxCompose" }
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-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", 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-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-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxCompose" }
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleRuntimeCompose" } androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" }
androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } androidx-core-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreCoreKts" }
androidx-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHilt" } androidx-datastore-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastoreDatastorePreferences" }
com-google-dagger-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "comGoogleDagger" } androidx-hilt-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltHiltNavigationCompose" }
com-google-dagger-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" } androidx-lifecycle-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleLifecycleRuntimeCompose" }
com-google-dagger-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "comGoogleDagger" } androidx-navigation-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigationNavigationCompose" }
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-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidxRoom" } 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-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidxRoom" }
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", 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" } androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTest" }
com-squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "comSquareupRetrofit2" } 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" } 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" } com-google-accompanist-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "comGoogleAccompanistAccompanistSystemuicontroller" }
android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } com-google-dagger-android-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } 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 # classpath
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" } android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }