diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c2115f51..7d242ee5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,6 @@ * along with this program. If not, see . */ -@file:Suppress("UnstableApiUsage") - plugins { // Basic stuff id("com.android.application") @@ -120,13 +118,13 @@ dependencies { implementation(libs.androidx.datastore) implementation(libs.androidx.appcompat) - implementation(project(mapOf("path" to ":feature:converter"))) - implementation(project(mapOf("path" to ":feature:calculator"))) - implementation(project(mapOf("path" to ":feature:settings"))) - implementation(project(mapOf("path" to ":feature:datecalculator"))) - implementation(project(mapOf("path" to ":feature:timezone"))) - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:userprefs"))) - implementation(project(mapOf("path" to ":core:ui"))) - implementation(project(mapOf("path" to ":core:base"))) + implementation(project(":feature:converter")) + implementation(project(":feature:calculator")) + implementation(project(":feature:settings")) + implementation(project(":feature:datecalculator")) + implementation(project(":feature:timezone")) + implementation(project(":data:model")) + implementation(project(":data:userprefs")) + implementation(project(":core:ui")) + implementation(project(":core:base")) } diff --git a/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt index 26c031fb..41bf1962 100644 --- a/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt +++ b/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt @@ -30,8 +30,8 @@ class UnittoLibraryFeaturePlugin : Plugin { dependencies { "implementation"(libs.findLibrary("androidx.navigation").get()) - "implementation"(project(mapOf("path" to ":core:base"))) - "implementation"(project(mapOf("path" to ":core:ui"))) + "implementation"(project(":core:base")) + "implementation"(project(":core:ui")) } } } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index cd7d4a87..c697c86f 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -43,5 +43,5 @@ dependencies { implementation(libs.androidx.navigation) - implementation(project(mapOf("path" to ":core:base"))) + implementation(project(":core:base")) } diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts index 9b5f6680..e5919173 100644 --- a/data/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -26,6 +26,6 @@ android { } dependencies { - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:database"))) + implementation(project(":data:model")) + implementation(project(":data:database")) } diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts index 196b31af..00c02c8d 100644 --- a/data/common/build.gradle.kts +++ b/data/common/build.gradle.kts @@ -27,6 +27,6 @@ android { dependencies { implementation(libs.androidx.core) implementation(libs.androidx.lifecycle.runtime.compose) - implementation(project(mapOf("path" to ":core:base"))) + implementation(project(":core:base")) testImplementation(libs.junit) } \ No newline at end of file diff --git a/data/evaluatto/build.gradle.kts b/data/evaluatto/build.gradle.kts index 30a2557b..5428162c 100644 --- a/data/evaluatto/build.gradle.kts +++ b/data/evaluatto/build.gradle.kts @@ -26,6 +26,6 @@ android { } dependencies { - implementation(project(mapOf("path" to ":core:base"))) + implementation(project(":core:base")) testImplementation(libs.junit) } diff --git a/data/model/build.gradle.kts b/data/model/build.gradle.kts index d6d0a1f5..7bc12002 100644 --- a/data/model/build.gradle.kts +++ b/data/model/build.gradle.kts @@ -25,6 +25,6 @@ android { } dependencies { - implementation(project(mapOf("path" to ":core:base"))) - implementation(project(mapOf("path" to ":data:common"))) + implementation(project(":core:base")) + implementation(project(":data:common")) } \ No newline at end of file diff --git a/data/timezone/build.gradle.kts b/data/timezone/build.gradle.kts index 8a98d783..4de5b10c 100644 --- a/data/timezone/build.gradle.kts +++ b/data/timezone/build.gradle.kts @@ -26,8 +26,8 @@ android { } dependencies { - implementation(project(mapOf("path" to ":core:base"))) - implementation(project(mapOf("path" to ":data:common"))) - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:database"))) + implementation(project(":core:base")) + implementation(project(":data:common")) + implementation(project(":data:model")) + implementation(project(":data:database")) } diff --git a/data/units/build.gradle.kts b/data/units/build.gradle.kts index ccdc68d1..81f59ffd 100644 --- a/data/units/build.gradle.kts +++ b/data/units/build.gradle.kts @@ -47,8 +47,8 @@ dependencies { implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.com.github.sadellie.themmo) - implementation(project(mapOf("path" to ":core:base"))) - implementation(project(mapOf("path" to ":data:database"))) - implementation(project(mapOf("path" to ":data:common"))) - implementation(project(mapOf("path" to ":data:model"))) + implementation(project(":core:base")) + implementation(project(":data:database")) + implementation(project(":data:common")) + implementation(project(":data:model")) } diff --git a/data/userprefs/build.gradle.kts b/data/userprefs/build.gradle.kts index 063de206..54216ba6 100644 --- a/data/userprefs/build.gradle.kts +++ b/data/userprefs/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation(libs.androidx.datastore) implementation(libs.com.github.sadellie.themmo) - implementation(project(mapOf("path" to ":core:base"))) - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:units"))) + implementation(project(":core:base")) + implementation(project(":data:model")) + implementation(project(":data:units")) } diff --git a/feature/calculator/build.gradle.kts b/feature/calculator/build.gradle.kts index d0055baf..bf1e84b9 100644 --- a/feature/calculator/build.gradle.kts +++ b/feature/calculator/build.gradle.kts @@ -30,10 +30,10 @@ android { dependencies { testImplementation(libs.junit) - implementation(project(mapOf("path" to ":data:common"))) - implementation(project(mapOf("path" to ":data:userprefs"))) - implementation(project(mapOf("path" to ":data:database"))) - implementation(project(mapOf("path" to ":data:calculator"))) - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:evaluatto"))) + implementation(project(":data:common")) + implementation(project(":data:userprefs")) + implementation(project(":data:database")) + implementation(project(":data:calculator")) + implementation(project(":data:model")) + implementation(project(":data:evaluatto")) } diff --git a/feature/converter/build.gradle.kts b/feature/converter/build.gradle.kts index d15a319d..e91d4ec4 100644 --- a/feature/converter/build.gradle.kts +++ b/feature/converter/build.gradle.kts @@ -41,10 +41,10 @@ dependencies { implementation(libs.com.squareup.moshi) implementation(libs.com.squareup.retrofit2) - implementation(project(mapOf("path" to ":data:common"))) - implementation(project(mapOf("path" to ":data:database"))) - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:userprefs"))) - implementation(project(mapOf("path" to ":data:units"))) - implementation(project(mapOf("path" to ":data:evaluatto"))) + implementation(project(":data:common")) + implementation(project(":data:database")) + implementation(project(":data:model")) + implementation(project(":data:userprefs")) + implementation(project(":data:units")) + implementation(project(":data:evaluatto")) } diff --git a/feature/datecalculator/build.gradle.kts b/feature/datecalculator/build.gradle.kts index 48377011..676d80d9 100644 --- a/feature/datecalculator/build.gradle.kts +++ b/feature/datecalculator/build.gradle.kts @@ -30,5 +30,5 @@ android { dependencies { testImplementation(libs.junit) - implementation(project(mapOf("path" to ":data:userprefs"))) + implementation(project(":data:userprefs")) } diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 74605010..632dc0d1 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -32,8 +32,8 @@ dependencies { implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.androidx.appcompat) - implementation(project(mapOf("path" to ":data:common"))) - implementation(project(mapOf("path" to ":data:model"))) - implementation(project(mapOf("path" to ":data:userprefs"))) - implementation(project(mapOf("path" to ":data:licenses"))) + implementation(project(":data:common")) + implementation(project(":data:model")) + implementation(project(":data:userprefs")) + implementation(project(":data:licenses")) } diff --git a/feature/timezone/build.gradle.kts b/feature/timezone/build.gradle.kts index b0bcd246..a17fbfdb 100644 --- a/feature/timezone/build.gradle.kts +++ b/feature/timezone/build.gradle.kts @@ -32,9 +32,9 @@ dependencies { implementation(libs.com.github.sadellie.themmo) implementation(libs.org.burnoutcrew.composereorderable) - implementation(project(mapOf("path" to ":data:common"))) - implementation(project(mapOf("path" to ":data:userprefs"))) - implementation(project(mapOf("path" to ":data:database"))) - implementation(project(mapOf("path" to ":data:timezone"))) - implementation(project(mapOf("path" to ":data:model"))) + implementation(project(":data:common")) + implementation(project(":data:userprefs")) + implementation(project(":data:database")) + implementation(project(":data:timezone")) + implementation(project(":data:model")) }