diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5d883e0b5..981b3cb3f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleApplication) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleApplication) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -116,17 +115,17 @@ dependencies { implementation(project(":feature_change_goals:views")) "playImplementation"(project(":feature_wear")) - implementation(Deps.Androidx.room) - implementation(Deps.Ktx.navigationFragment) - implementation(Deps.Ktx.navigationUi) - implementation(Deps.Google.dagger) + implementation(libs.androidx.room) + implementation(libs.ktx.navigationFragment) + implementation(libs.ktx.navigationUi) + implementation(libs.google.dagger) - ksp(Deps.Kapt.dagger) - kspAndroidTest(Deps.Kapt.dagger) + ksp(libs.kapt.dagger) + kspAndroidTest(libs.kapt.dagger) - androidTestImplementation(Deps.UiTest.junit) - androidTestImplementation(Deps.UiTest.espresso) - androidTestImplementation(Deps.UiTest.espressoContrib) - androidTestImplementation(Deps.UiTest.dagger) - androidTestImplementation(Deps.UiTest.room) + androidTestImplementation(libs.uitest.junit) + androidTestImplementation(libs.uitest.espresso) + androidTestImplementation(libs.uitest.espressoContrib) + androidTestImplementation(libs.uitest.dagger) + androidTestImplementation(libs.uitest.room) } diff --git a/build.gradle.kts b/build.gradle.kts index 7776d5ef3..ae790ddca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,12 @@ plugins { - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - .version(com.example.util.simpletimetracker.Versions.ksp) - .apply(false) - id(com.example.util.simpletimetracker.BuildPlugins.gradleApplication) - .version(com.example.util.simpletimetracker.Versions.gradle) - .apply(false) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - .version(com.example.util.simpletimetracker.Versions.kotlin) - .apply(false) - id(com.example.util.simpletimetracker.BuildPlugins.ktlint) - .version(com.example.util.simpletimetracker.Versions.ktlint) - .apply(false) - id(com.example.util.simpletimetracker.BuildPlugins.hilt) - .version(com.example.util.simpletimetracker.Versions.dagger) - .apply(false) + alias(libs.plugins.gradleApplication) apply false + alias(libs.plugins.gradleLibrary) apply false + alias(libs.plugins.kotlin) apply false + alias(libs.plugins.kotlinParcelize) apply false + alias(libs.plugins.kotlinLibrary) apply false + alias(libs.plugins.ktlint) apply false + alias(libs.plugins.hilt) apply false + alias(libs.plugins.ksp) apply false } allprojects { @@ -22,7 +15,7 @@ allprojects { mavenCentral() } - apply(plugin = com.example.util.simpletimetracker.BuildPlugins.ktlint) + apply(plugin = rootProject.libs.plugins.ktlint.get().pluginId) } tasks { diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/BuildPlugins.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/BuildPlugins.kt deleted file mode 100644 index a67ea3b7c..000000000 --- a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/BuildPlugins.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.util.simpletimetracker - -object BuildPlugins { - const val gradleApplication = "com.android.application" - const val gradleLibrary = "com.android.library" - const val kotlin = "org.jetbrains.kotlin.android" // short "kotlin-android" - const val kotlinLibrary = "org.jetbrains.kotlin.jvm" // short "kotlin" - const val kotlinParcelize = "org.jetbrains.kotlin.plugin.parcelize" // short "kotlin-parcelize" - const val javaLibrary = "java-library" - const val ktlint = "org.jlleitschuh.gradle.ktlint" - const val hilt = "com.google.dagger.hilt.android" - const val hiltPlugin = "dagger.hilt.android.plugin" - const val ksp = "com.google.devtools.ksp" -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt deleted file mode 100644 index ad99cd236..000000000 --- a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.example.util.simpletimetracker - -object Deps { - const val kotlin = - "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}" - const val coroutines = - "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}" - const val javax = - "javax.inject:javax.inject:${Versions.javax}" - const val timber = - "com.jakewharton.timber:timber:${Versions.timber}" - - object Androidx { - const val appcompat = - "androidx.appcompat:appcompat:${Versions.appcompat}" - const val constraintLayout = - "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}" - const val recyclerView = - "androidx.recyclerview:recyclerview:${Versions.recyclerView}" - const val room = - "androidx.room:room-runtime:${Versions.room}" - const val viewpager2 = - "androidx.viewpager2:viewpager2:${Versions.viewpager2}" - const val cardView = - "androidx.cardview:cardview:${Versions.cardView}" - const val material = - "com.google.android.material:material:${Versions.material}" - } - - object Google { - const val dagger = - "com.google.dagger:hilt-android:${Versions.dagger}" - const val flexBox = - "com.google.android.flexbox:flexbox:${Versions.flexBox}" - const val services = - "com.google.android.gms:play-services-wearable:${Versions.services}" - const val gson = - "com.google.code.gson:gson:${Versions.gson}" - const val desugaring = - "com.android.tools:desugar_jdk_libs:${Versions.desugaring}" - } - - object Emoji { - const val emojiBundled = - "androidx.emoji2:emoji2-bundled:${Versions.emoji}" - } - - object Ktx { - const val core = - "androidx.core:core-ktx:${Versions.coreKtx}" - const val fragment = - "androidx.fragment:fragment-ktx:${Versions.fragmentKtx}" - const val liveDataCore = - "androidx.lifecycle:lifecycle-livedata-core-ktx:${Versions.liveDataCoreKtx}" - const val liveData = - "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.liveDataKtx}" - const val viewModel = - "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.viewModelKtx}" - const val room = - "androidx.room:room-ktx:${Versions.room}" - const val navigationFragment = - "androidx.navigation:navigation-fragment-ktx:${Versions.navigationKtx}" - const val navigationUi = - "androidx.navigation:navigation-ui-ktx:${Versions.navigationKtx}" - const val activity = - "androidx.activity:activity-ktx:${Versions.activityKtx}" - } - - object Compose { - const val activity = - "androidx.activity:activity-compose:${Versions.compose_version}" - const val ui = - "androidx.compose.ui:ui:${Versions.compose_version}" - const val uiToolingPreview = - "androidx.compose.ui:ui-tooling-preview:${Versions.compose_version}" - const val materialIcons = - "androidx.compose.material:material-icons-core:${Versions.compose_icons}" - const val wearNavigation = - "androidx.wear.compose:compose-navigation:${Versions.wear_compose_version}" - const val wearMaterial = - "androidx.wear.compose:compose-material:${Versions.wear_compose_version}" - const val wearFoundation = - "androidx.wear.compose:compose-foundation:${Versions.wear_compose_version}" - const val wearToolingPreview = - "androidx.wear:wear-tooling-preview:${Versions.wear_compose_tooling_preview}" - const val horologist = - "com.google.android.horologist:horologist-compose-layout:${Versions.horologist}" - const val hilt = - "androidx.hilt:hilt-navigation-compose:${Versions.compose_hilt}" - const val uiTooling = - "androidx.compose.ui:ui-tooling:${Versions.compose_version}" - } - - object Wear { - const val complications = - "androidx.wear.watchface:watchface-complications-data-source-ktx:${Versions.wear_complications}" - const val wearOngoing = - "androidx.wear:wear-ongoing:${Versions.wear_ongoing}" - } - - object Kapt { - const val room = - "androidx.room:room-compiler:${Versions.room}" - const val dagger = - "com.google.dagger:hilt-compiler:${Versions.dagger}" - const val metadata = - "org.jetbrains.kotlinx:kotlinx-metadata-jvm:${Versions.metadata_jvm}" - } - - object Test { - const val junit = - "junit:junit:${Versions.junit}" - const val mockito = - "org.mockito:mockito-core:${Versions.mockito}" - const val mockitoKotlin = - "org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}" - const val coroutines = - "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutinesTest}" - } - - object UiTest { - const val junit = - "androidx.test.ext:junit:${Versions.junitUi}" - const val espresso = - "androidx.test.espresso:espresso-core:${Versions.espresso}" - const val espressoContrib = - "androidx.test.espresso:espresso-contrib:${Versions.espresso}" - const val espressoIdling = - "androidx.test.espresso:espresso-idling-resource:${Versions.espresso}" - const val dagger = - "com.google.dagger:hilt-android-testing:${Versions.dagger}" - const val room = - "androidx.room:room-testing:${Versions.room}" - } -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt deleted file mode 100644 index 181159a00..000000000 --- a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Versions.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.example.util.simpletimetracker - -object Versions { - const val gradle = "8.4.0" - const val kotlin = "1.9.25" - const val ktlint = "12.1.0" - const val ksp = "${kotlin}-1.0.20" - - const val coroutines = "1.6.4" - const val timber = "4.7.1" - const val javax = "1" - - const val appcompat = "1.7.0" - const val constraintLayout = "2.1.4" - const val recyclerView = "1.1.0" - const val room = "2.6.1" - const val dagger = "2.52" - const val viewpager2 = "1.0.0" - const val flexBox = "3.0.0" - const val services = "18.0.0" - const val gson = "2.10.1" - const val desugaring = "1.1.6" - const val cardView = "1.0.0" - const val material = "1.12.0" - const val emoji = "1.5.0" - - const val fragmentKtx = "1.6.2" // 1.8.2 breaks shared transition when deleting running record. - const val coreKtx = "1.2.0" - const val liveDataCoreKtx = "2.8.4" - const val liveDataKtx = "2.8.4" - const val viewModelKtx = "2.8.4" - const val navigationKtx = "2.5.3" - const val activityKtx = "1.8.2" - - const val compose_version = "1.3.1" - const val wear_compose_version = "1.2.1" - const val compose_icons = "1.6.1" - const val wear_compose_tooling_preview = "1.0.0" - const val horologist = "0.2.7" - const val compose_kotlin_compiler = "1.5.15" - const val compose_hilt = "1.0.0" - const val wear_complications = "1.2.1" - const val wear_ongoing = "1.0.0" - const val metadata_jvm = "0.5.0" - - const val junit = "4.13" - const val junitUi = "1.1.4" - const val espresso = "3.5.0" - const val mockito = "5.14.2" - const val mockitoKotlin = "5.4.0" - const val coroutinesTest = "1.7.1" -} \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2f38c7d36..a4913226c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) } applyAndroidLibrary() @@ -23,23 +22,23 @@ dependencies { api(project(":feature_base_adapter")) api(project(":feature_views")) - api(Deps.Androidx.appcompat) - api(Deps.Androidx.recyclerView) - api(Deps.Androidx.constraintLayout) - api(Deps.Androidx.cardView) - api(Deps.Androidx.material) - api(Deps.Androidx.viewpager2) - api(Deps.Emoji.emojiBundled) - api(Deps.Google.flexBox) - api(Deps.Google.dagger) - api(Deps.Ktx.core) - api(Deps.Ktx.fragment) - api(Deps.Ktx.liveDataCore) - api(Deps.Ktx.liveData) - api(Deps.Ktx.viewModel) - api(Deps.Ktx.activity) - api(Deps.UiTest.espressoIdling) + api(libs.androidx.appcompat) + api(libs.androidx.recyclerView) + api(libs.androidx.constraintLayout) + api(libs.androidx.cardView) + api(libs.androidx.material) + api(libs.androidx.viewpager2) + api(libs.emoji.emojiBundled) + api(libs.google.flexBox) + api(libs.google.dagger) + api(libs.ktx.core) + api(libs.ktx.fragment) + api(libs.ktx.liveDataCore) + api(libs.ktx.liveData) + api(libs.ktx.viewModel) + api(libs.ktx.activity) + api(libs.uitest.espressoIdling) - testImplementation(Deps.Test.junit) - testImplementation(Deps.Test.mockito) + testImplementation(libs.test.junit) + testImplementation(libs.test.mockito) } diff --git a/data_local/build.gradle.kts b/data_local/build.gradle.kts index 673cc00db..2adee2b1f 100644 --- a/data_local/build.gradle.kts +++ b/data_local/build.gradle.kts @@ -1,11 +1,10 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) } applyAndroidLibrary() @@ -25,9 +24,9 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Androidx.room) - implementation(Deps.Ktx.room) + implementation(libs.androidx.room) + implementation(libs.ktx.room) - ksp(Deps.Kapt.room) - ksp(Deps.Kapt.dagger) + ksp(libs.kapt.room) + ksp(libs.kapt.dagger) } diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index da764b244..5ad7c2200 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,8 +1,6 @@ -import com.example.util.simpletimetracker.Deps - plugins { - id(com.example.util.simpletimetracker.BuildPlugins.javaLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinLibrary) + id(libs.plugins.javaLibrary.get().pluginId) + alias(libs.plugins.kotlinLibrary) } java { @@ -11,11 +9,11 @@ java { } dependencies { - api(Deps.javax) - api(Deps.coroutines) - api(Deps.timber) - api(Deps.kotlin) + api(libs.javax) + api(libs.coroutines) + api(libs.timber) + api(libs.kotlin) - testImplementation(Deps.Test.junit) - testImplementation(Deps.Test.mockitoKotlin) + testImplementation(libs.test.junit) + testImplementation(libs.test.mockitoKotlin) } diff --git a/features/feature_archive/build.gradle.kts b/features/feature_archive/build.gradle.kts index 80622cb7a..5abc5d3c8 100644 --- a/features/feature_archive/build.gradle.kts +++ b/features/feature_archive/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_base_adapter/build.gradle.kts b/features/feature_base_adapter/build.gradle.kts index 3d885ddc4..cf5780ad5 100644 --- a/features/feature_base_adapter/build.gradle.kts +++ b/features/feature_base_adapter/build.gradle.kts @@ -1,11 +1,10 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) } applyAndroidLibrary() @@ -19,10 +18,10 @@ dependencies { implementation(project(":domain")) implementation(project(":resources")) - implementation(Deps.Androidx.recyclerView) - implementation(Deps.Androidx.constraintLayout) - implementation(Deps.Androidx.cardView) - implementation(Deps.Androidx.material) - implementation(Deps.Google.flexBox) - implementation(Deps.Ktx.core) + implementation(libs.androidx.recyclerView) + implementation(libs.androidx.constraintLayout) + implementation(libs.androidx.cardView) + implementation(libs.androidx.material) + implementation(libs.google.flexBox) + implementation(libs.ktx.core) } diff --git a/features/feature_categories/build.gradle.kts b/features/feature_categories/build.gradle.kts index c6cb76287..e9bdb396d 100644 --- a/features/feature_categories/build.gradle.kts +++ b/features/feature_categories/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_activity_filter/build.gradle.kts b/features/feature_change_activity_filter/build.gradle.kts index 0bffece33..d5d7c99ab 100644 --- a/features/feature_change_activity_filter/build.gradle.kts +++ b/features/feature_change_activity_filter/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":core")) implementation(project(":feature_views")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_category/build.gradle.kts b/features/feature_change_category/build.gradle.kts index 60d0213aa..b6c9289fa 100644 --- a/features/feature_change_category/build.gradle.kts +++ b/features/feature_change_category/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -19,6 +18,6 @@ dependencies { implementation(project(":core")) implementation(project(":feature_change_goals:api")) implementation(project(":feature_change_goals:views")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_complex_rule/build.gradle.kts b/features/feature_change_complex_rule/build.gradle.kts index 0a87d50af..38186156a 100644 --- a/features/feature_change_complex_rule/build.gradle.kts +++ b/features/feature_change_complex_rule/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":core")) implementation(project(":feature_views")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_goals/api/build.gradle.kts b/features/feature_change_goals/api/build.gradle.kts index 4130cc4c6..cd4d771c5 100644 --- a/features/feature_change_goals/api/build.gradle.kts +++ b/features/feature_change_goals/api/build.gradle.kts @@ -2,9 +2,9 @@ import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) } applyAndroidLibrary() diff --git a/features/feature_change_goals/build.gradle.kts b/features/feature_change_goals/build.gradle.kts index 6673b42f1..02618f0a7 100644 --- a/features/feature_change_goals/build.gradle.kts +++ b/features/feature_change_goals/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":feature_change_goals:api")) implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_goals/views/build.gradle.kts b/features/feature_change_goals/views/build.gradle.kts index 7f096cc6c..85f83ba5a 100644 --- a/features/feature_change_goals/views/build.gradle.kts +++ b/features/feature_change_goals/views/build.gradle.kts @@ -2,9 +2,9 @@ import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) } applyAndroidLibrary() diff --git a/features/feature_change_record/build.gradle.kts b/features/feature_change_record/build.gradle.kts index 2f1ee9cb9..afa43414a 100644 --- a/features/feature_change_record/build.gradle.kts +++ b/features/feature_change_record/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_record_tag/build.gradle.kts b/features/feature_change_record_tag/build.gradle.kts index e0d4f92b5..97779ea91 100644 --- a/features/feature_change_record_tag/build.gradle.kts +++ b/features/feature_change_record_tag/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_record_type/build.gradle.kts b/features/feature_change_record_type/build.gradle.kts index 1acbf6542..bafa878c6 100644 --- a/features/feature_change_record_type/build.gradle.kts +++ b/features/feature_change_record_type/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -19,6 +18,6 @@ dependencies { implementation(project(":core")) implementation(project(":feature_change_goals:api")) implementation(project(":feature_change_goals:views")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_change_running_record/build.gradle.kts b/features/feature_change_running_record/build.gradle.kts index 10f2e2875..bf53dc4e8 100644 --- a/features/feature_change_running_record/build.gradle.kts +++ b/features/feature_change_running_record/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":core")) implementation(project(":feature_change_record")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_complex_rules/build.gradle.kts b/features/feature_complex_rules/build.gradle.kts index a76aa968e..c3eca8eb7 100644 --- a/features/feature_complex_rules/build.gradle.kts +++ b/features/feature_complex_rules/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_data_edit/build.gradle.kts b/features/feature_data_edit/build.gradle.kts index c698f92d2..27b723869 100644 --- a/features/feature_data_edit/build.gradle.kts +++ b/features/feature_data_edit/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_dialogs/build.gradle.kts b/features/feature_dialogs/build.gradle.kts index ee30642d0..88a321d6d 100644 --- a/features/feature_dialogs/build.gradle.kts +++ b/features/feature_dialogs/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_goals/build.gradle.kts b/features/feature_goals/build.gradle.kts index 9d0870ed3..016bcc256 100644 --- a/features/feature_goals/build.gradle.kts +++ b/features/feature_goals/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_main/build.gradle.kts b/features/feature_main/build.gradle.kts index 96be7b6aa..8212e7a56 100644 --- a/features/feature_main/build.gradle.kts +++ b/features/feature_main/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -22,6 +21,6 @@ dependencies { implementation(project(":feature_statistics")) implementation(project(":feature_settings")) implementation(project(":feature_goals")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_notification/build.gradle.kts b/features/feature_notification/build.gradle.kts index 9b15f9190..97d918113 100644 --- a/features/feature_notification/build.gradle.kts +++ b/features/feature_notification/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_pomodoro/build.gradle.kts b/features/feature_pomodoro/build.gradle.kts index e925cfb47..d2c486b7b 100644 --- a/features/feature_pomodoro/build.gradle.kts +++ b/features/feature_pomodoro/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -19,6 +18,6 @@ dependencies { implementation(project(":core")) implementation(project(":feature_settings:api")) implementation(project(":feature_settings:views")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_records/build.gradle.kts b/features/feature_records/build.gradle.kts index 94ff1fe03..3c1233bfe 100644 --- a/features/feature_records/build.gradle.kts +++ b/features/feature_records/build.gradle.kts @@ -1,13 +1,12 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_records_all/build.gradle.kts b/features/feature_records_all/build.gradle.kts index 54236690c..ceac447ae 100644 --- a/features/feature_records_all/build.gradle.kts +++ b/features/feature_records_all/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_records_filter/build.gradle.kts b/features/feature_records_filter/build.gradle.kts index 085298dc5..8981098c6 100644 --- a/features/feature_records_filter/build.gradle.kts +++ b/features/feature_records_filter/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_running_records/build.gradle.kts b/features/feature_running_records/build.gradle.kts index 4d05f3564..c5a0e5ad5 100644 --- a/features/feature_running_records/build.gradle.kts +++ b/features/feature_running_records/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_settings/api/build.gradle.kts b/features/feature_settings/api/build.gradle.kts index 8340ca638..52ef5b612 100644 --- a/features/feature_settings/api/build.gradle.kts +++ b/features/feature_settings/api/build.gradle.kts @@ -2,9 +2,9 @@ import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) } applyAndroidLibrary() diff --git a/features/feature_settings/build.gradle.kts b/features/feature_settings/build.gradle.kts index 171e4ac88..94ec8c263 100644 --- a/features/feature_settings/build.gradle.kts +++ b/features/feature_settings/build.gradle.kts @@ -1,13 +1,12 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -20,6 +19,6 @@ dependencies { implementation(project(":core")) implementation(project(":feature_settings:api")) implementation(project(":feature_settings:views")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_settings/views/build.gradle.kts b/features/feature_settings/views/build.gradle.kts index 1f18dd2d1..4bad86d44 100644 --- a/features/feature_settings/views/build.gradle.kts +++ b/features/feature_settings/views/build.gradle.kts @@ -1,11 +1,10 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) } applyAndroidLibrary() @@ -19,8 +18,8 @@ dependencies { implementation(project(":feature_views")) implementation(project(":feature_base_adapter")) - implementation(Deps.Androidx.appcompat) - implementation(Deps.Androidx.constraintLayout) - implementation(Deps.Androidx.cardView) - implementation(Deps.Androidx.material) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.constraintLayout) + implementation(libs.androidx.cardView) + implementation(libs.androidx.material) } diff --git a/features/feature_statistics/build.gradle.kts b/features/feature_statistics/build.gradle.kts index f3b3d43b0..964f6da53 100644 --- a/features/feature_statistics/build.gradle.kts +++ b/features/feature_statistics/build.gradle.kts @@ -1,13 +1,12 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_statistics_detail/build.gradle.kts b/features/feature_statistics_detail/build.gradle.kts index 40dacc693..57fc2969c 100644 --- a/features/feature_statistics_detail/build.gradle.kts +++ b/features/feature_statistics_detail/build.gradle.kts @@ -1,13 +1,12 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -18,6 +17,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_tag_selection/build.gradle.kts b/features/feature_tag_selection/build.gradle.kts index 11dbf0e71..b76501c48 100644 --- a/features/feature_tag_selection/build.gradle.kts +++ b/features/feature_tag_selection/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -17,6 +16,6 @@ android { dependencies { implementation(project(":core")) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) } diff --git a/features/feature_views/build.gradle.kts b/features/feature_views/build.gradle.kts index 138be774e..67dfa35f2 100644 --- a/features/feature_views/build.gradle.kts +++ b/features/feature_views/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) } applyAndroidLibrary() @@ -16,9 +15,9 @@ android { } dependencies { - implementation(Deps.Androidx.appcompat) - implementation(Deps.Androidx.recyclerView) - implementation(Deps.Androidx.constraintLayout) - implementation(Deps.Androidx.cardView) - implementation(Deps.Androidx.material) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.recyclerView) + implementation(libs.androidx.constraintLayout) + implementation(libs.androidx.cardView) + implementation(libs.androidx.material) } diff --git a/features/feature_wear/build.gradle.kts b/features/feature_wear/build.gradle.kts index 301bdb422..db396e53d 100644 --- a/features/feature_wear/build.gradle.kts +++ b/features/feature_wear/build.gradle.kts @@ -4,14 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -23,11 +22,11 @@ android { dependencies { implementation(project(":core")) implementation(project(":wear_api")) - implementation(Deps.Google.services) - implementation(Deps.Google.gson) - implementation(Deps.Google.dagger) - ksp(Deps.Kapt.dagger) + implementation(libs.google.services) + implementation(libs.google.gson) + implementation(libs.google.dagger) + ksp(libs.kapt.dagger) - testImplementation(Deps.Test.junit) - testImplementation(Deps.Test.coroutines) + testImplementation(libs.test.junit) + testImplementation(libs.test.coroutines) } diff --git a/features/feature_widget/build.gradle.kts b/features/feature_widget/build.gradle.kts index b1c437f35..dc84e90c5 100644 --- a/features/feature_widget/build.gradle.kts +++ b/features/feature_widget/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidLibrary() @@ -21,9 +20,9 @@ dependencies { implementation(project(":feature_dialogs")) implementation(project(":feature_views")) - implementation(Deps.Ktx.navigationFragment) - implementation(Deps.Ktx.navigationUi) - implementation(Deps.Google.dagger) + implementation(libs.ktx.navigationFragment) + implementation(libs.ktx.navigationUi) + implementation(libs.google.dagger) - ksp(Deps.Kapt.dagger) + ksp(libs.kapt.dagger) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..4ce050496 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,132 @@ +[versions] +gradle = "8.4.0" +kotlin = "1.9.25" +ktlint = "12.1.0" +ksp = "1.9.25-1.0.20" # same as kotlin + +coroutines = "1.6.4" +timber = "4.7.1" +javax = "1" + +appcompat = "1.7.0" +constraintLayout = "2.1.4" +recyclerView = "1.1.0" +room = "2.6.1" +dagger = "2.52" +viewpager2 = "1.0.0" +flexBox = "3.0.0" +services = "18.0.0" +gson = "2.10.1" +desugaring = "1.1.6" +cardView = "1.0.0" +material = "1.12.0" +emoji = "1.5.0" + +fragmentKtx = "1.6.2" # 1.8.2 breaks shared transition when deleting running record. +coreKtx = "1.2.0" +liveDataCoreKtx = "2.8.4" +liveDataKtx = "2.8.4" +viewModelKtx = "2.8.4" +navigationKtx = "2.5.3" +activityKtx = "1.8.2" + +compose_version = "1.3.1" +wear_compose_version = "1.2.1" +compose_icons = "1.6.1" +wear_compose_tooling_preview = "1.0.0" +horologist = "0.2.7" +compose_kotlin_compiler = "1.5.15" +compose_hilt = "1.0.0" +wear_complications = "1.2.1" +wear_ongoing = "1.0.0" +metadata_jvm = "0.5.0" + +junit = "4.13" +junitUi = "1.1.4" +espresso = "3.5.0" +mockito = "5.14.2" +mockitoKotlin = "5.4.0" +coroutinesTest = "1.7.1" + +[libraries] +kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +javax = { group = "javax.inject", name = "javax.inject", version.ref = "javax" } +timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" } + +# Androidx +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" } +androidx-recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" } +androidx-room = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" } +androidx-cardView = { group = "androidx.cardview", name = "cardview", version.ref = "cardView" } +androidx-material = { group = "com.google.android.material", name = "material", version.ref = "material" } + +# Google +google-dagger = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } +google-flexBox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "flexBox" } +google-services = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "services" } +google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +google-desugaring = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugaring" } + +# Emoji +emoji-emojiBundled = { group = "androidx.emoji2", name = "emoji2-bundled", version.ref = "emoji" } + +# Ktx +ktx-core = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +ktx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" } +ktx-liveDataCore = { group = "androidx.lifecycle", name = "lifecycle-livedata-core-ktx", version.ref = "liveDataCoreKtx" } +ktx-liveData = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "liveDataKtx" } +ktx-viewModel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "viewModelKtx" } +ktx-room = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +ktx-navigationFragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationKtx" } +ktx-navigationUi = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationKtx" } +ktx-activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityKtx" } + +# Compose +compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "compose_version" } +compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose_version" } +compose-uiToolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose_version" } +compose-materialIcons = { group = "androidx.compose.material", name = "material-icons-core", version.ref = "compose_icons" } +compose-wearNavigation = { group = "androidx.wear.compose", name = "compose-navigation", version.ref = "wear_compose_version" } +compose-wearMaterial = { group = "androidx.wear.compose", name = "compose-material", version.ref = "wear_compose_version" } +compose-wearFoundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "wear_compose_version" } +compose-wearToolingPreview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "wear_compose_tooling_preview" } +compose-horologist = { group = "com.google.android.horologist", name = "horologist-compose-layout", version.ref = "horologist" } +compose-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "compose_hilt" } +compose-uiTooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose_version" } + +# Wear +wear-complications = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "wear_complications" } +wear-wearOngoing = { group = "androidx.wear", name = "wear-ongoing", version.ref = "wear_ongoing" } + +# Kapt +kapt-room = { group = "androidx.room", name = "room-compiler", version.ref = "room" } +kapt-dagger = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } +kapt-metadata = { group = "org.jetbrains.kotlinx", name = "kotlinx-metadata-jvm", version.ref = "metadata_jvm" } + +# Test +test-junit = { group = "junit", name = "junit", version.ref = "junit" } +test-mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } +test-mockitoKotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlin" } +test-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" } + +# UiTest +uitest-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitUi" } +uitest-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" } +uitest-espressoContrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" } +uitest-espressoIdling = { group = "androidx.test.espresso", name = "espresso-idling-resource", version.ref = "espresso" } +uitest-dagger = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } +uitest-room = { group = "androidx.room", name = "room-testing", version.ref = "room" } + +[plugins] +gradleApplication = { id = "com.android.application", version.ref = "gradle" } +gradleLibrary = { id = "com.android.library", version.ref = "gradle" } +kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } # short "kotlin-android" +kotlinLibrary = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } # short "kotlin" +kotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } # short "kotlin-parcelize" +javaLibrary = { id = "java-library" } +ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } +hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts index b878423c9..14df76d2b 100644 --- a/navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -1,12 +1,11 @@ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) + alias(libs.plugins.ksp) } applyAndroidLibrary() @@ -18,7 +17,7 @@ android { dependencies { implementation(project(":domain")) - implementation(Deps.Ktx.fragment) - implementation(Deps.Ktx.navigationFragment) - implementation(Deps.Ktx.navigationUi) + implementation(libs.ktx.fragment) + implementation(libs.ktx.navigationFragment) + implementation(libs.ktx.navigationUi) } diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts index a21a9c77a..cc69c95fc 100644 --- a/resources/build.gradle.kts +++ b/resources/build.gradle.kts @@ -2,8 +2,8 @@ import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) } applyAndroidLibrary() diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index 9a3790ecb..7bbe33416 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -4,15 +4,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps -import com.example.util.simpletimetracker.Versions import com.example.util.simpletimetracker.applyAndroidWearLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleApplication) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.ksp) - id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin) + alias(libs.plugins.gradleApplication) + alias(libs.plugins.kotlin) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) } applyAndroidWearLibrary() @@ -55,7 +53,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = Versions.compose_kotlin_compiler + kotlinCompilerExtensionVersion = libs.versions.compose.kotlin.compiler.get() } } @@ -63,28 +61,28 @@ dependencies { implementation(project(":wear_api")) implementation(project(":resources")) - implementation(Deps.Androidx.appcompat) - implementation(Deps.Google.services) - implementation(Deps.Google.gson) - implementation(Deps.Google.dagger) - implementation(Deps.Wear.complications) - implementation(Deps.Wear.wearOngoing) - coreLibraryDesugaring(Deps.Google.desugaring) - implementation(Deps.Compose.activity) - implementation(Deps.Compose.ui) - implementation(Deps.Compose.uiToolingPreview) - implementation(Deps.Compose.materialIcons) - implementation(Deps.Compose.wearNavigation) - implementation(Deps.Compose.wearMaterial) - implementation(Deps.Compose.wearFoundation) - implementation(Deps.Compose.wearToolingPreview) - implementation(Deps.Compose.horologist) - implementation(Deps.Compose.hilt) - debugImplementation(Deps.Compose.uiTooling) - ksp(Deps.Kapt.dagger) - ksp(Deps.Kapt.metadata) + implementation(libs.androidx.appcompat) + implementation(libs.google.services) + implementation(libs.google.gson) + implementation(libs.google.dagger) + implementation(libs.wear.complications) + implementation(libs.wear.wearOngoing) + coreLibraryDesugaring(libs.google.desugaring) + implementation(libs.compose.activity) + implementation(libs.compose.ui) + implementation(libs.compose.uiToolingPreview) + implementation(libs.compose.materialIcons) + implementation(libs.compose.wearNavigation) + implementation(libs.compose.wearMaterial) + implementation(libs.compose.wearFoundation) + implementation(libs.compose.wearToolingPreview) + implementation(libs.compose.horologist) + implementation(libs.compose.hilt) + debugImplementation(libs.compose.uiTooling) + ksp(libs.kapt.dagger) + ksp(libs.kapt.metadata) - testImplementation(Deps.Test.junit) - testImplementation(Deps.Test.mockito) - testImplementation(Deps.Test.coroutines) + testImplementation(libs.test.junit) + testImplementation(libs.test.mockito) + testImplementation(libs.test.coroutines) } \ No newline at end of file diff --git a/wear_api/build.gradle.kts b/wear_api/build.gradle.kts index 137d4efb0..b098402d6 100644 --- a/wear_api/build.gradle.kts +++ b/wear_api/build.gradle.kts @@ -4,13 +4,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import com.example.util.simpletimetracker.Base -import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary plugins { - id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary) - id(com.example.util.simpletimetracker.BuildPlugins.kotlin) - id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize) + alias(libs.plugins.gradleLibrary) + alias(libs.plugins.kotlin) + alias(libs.plugins.kotlinParcelize) } applyAndroidLibrary() @@ -20,5 +19,5 @@ android { } dependencies { - implementation(Deps.Google.gson) + implementation(libs.google.gson) } \ No newline at end of file