Don't use map for dependencies

This commit is contained in:
Sad Ellie 2023-09-19 13:42:36 +03:00
parent d8a41de848
commit 8fee9d065d
15 changed files with 51 additions and 53 deletions

View File

@ -16,8 +16,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@file:Suppress("UnstableApiUsage")
plugins { plugins {
// Basic stuff // Basic stuff
id("com.android.application") id("com.android.application")
@ -120,13 +118,13 @@ dependencies {
implementation(libs.androidx.datastore) implementation(libs.androidx.datastore)
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat)
implementation(project(mapOf("path" to ":feature:converter"))) implementation(project(":feature:converter"))
implementation(project(mapOf("path" to ":feature:calculator"))) implementation(project(":feature:calculator"))
implementation(project(mapOf("path" to ":feature:settings"))) implementation(project(":feature:settings"))
implementation(project(mapOf("path" to ":feature:datecalculator"))) implementation(project(":feature:datecalculator"))
implementation(project(mapOf("path" to ":feature:timezone"))) implementation(project(":feature:timezone"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:userprefs"))) implementation(project(":data:userprefs"))
implementation(project(mapOf("path" to ":core:ui"))) implementation(project(":core:ui"))
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
} }

View File

@ -30,8 +30,8 @@ class UnittoLibraryFeaturePlugin : Plugin<Project> {
dependencies { dependencies {
"implementation"(libs.findLibrary("androidx.navigation").get()) "implementation"(libs.findLibrary("androidx.navigation").get())
"implementation"(project(mapOf("path" to ":core:base"))) "implementation"(project(":core:base"))
"implementation"(project(mapOf("path" to ":core:ui"))) "implementation"(project(":core:ui"))
} }
} }
} }

View File

@ -43,5 +43,5 @@ dependencies {
implementation(libs.androidx.navigation) implementation(libs.androidx.navigation)
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
} }

View File

@ -26,6 +26,6 @@ android {
} }
dependencies { dependencies {
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:database"))) implementation(project(":data:database"))
} }

View File

@ -27,6 +27,6 @@ android {
dependencies { dependencies {
implementation(libs.androidx.core) implementation(libs.androidx.core)
implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.lifecycle.runtime.compose)
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
testImplementation(libs.junit) testImplementation(libs.junit)
} }

View File

@ -26,6 +26,6 @@ android {
} }
dependencies { dependencies {
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
testImplementation(libs.junit) testImplementation(libs.junit)
} }

View File

@ -25,6 +25,6 @@ android {
} }
dependencies { dependencies {
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
} }

View File

@ -26,8 +26,8 @@ android {
} }
dependencies { dependencies {
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:database"))) implementation(project(":data:database"))
} }

View File

@ -47,8 +47,8 @@ dependencies {
implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.org.burnoutcrew.composereorderable)
implementation(libs.com.github.sadellie.themmo) implementation(libs.com.github.sadellie.themmo)
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
implementation(project(mapOf("path" to ":data:database"))) implementation(project(":data:database"))
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
} }

View File

@ -29,7 +29,7 @@ dependencies {
implementation(libs.androidx.datastore) implementation(libs.androidx.datastore)
implementation(libs.com.github.sadellie.themmo) implementation(libs.com.github.sadellie.themmo)
implementation(project(mapOf("path" to ":core:base"))) implementation(project(":core:base"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:units"))) implementation(project(":data:units"))
} }

View File

@ -30,10 +30,10 @@ android {
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit)
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
implementation(project(mapOf("path" to ":data:userprefs"))) implementation(project(":data:userprefs"))
implementation(project(mapOf("path" to ":data:database"))) implementation(project(":data:database"))
implementation(project(mapOf("path" to ":data:calculator"))) implementation(project(":data:calculator"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:evaluatto"))) implementation(project(":data:evaluatto"))
} }

View File

@ -41,10 +41,10 @@ dependencies {
implementation(libs.com.squareup.moshi) implementation(libs.com.squareup.moshi)
implementation(libs.com.squareup.retrofit2) implementation(libs.com.squareup.retrofit2)
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
implementation(project(mapOf("path" to ":data:database"))) implementation(project(":data:database"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:userprefs"))) implementation(project(":data:userprefs"))
implementation(project(mapOf("path" to ":data:units"))) implementation(project(":data:units"))
implementation(project(mapOf("path" to ":data:evaluatto"))) implementation(project(":data:evaluatto"))
} }

View File

@ -30,5 +30,5 @@ android {
dependencies { dependencies {
testImplementation(libs.junit) testImplementation(libs.junit)
implementation(project(mapOf("path" to ":data:userprefs"))) implementation(project(":data:userprefs"))
} }

View File

@ -32,8 +32,8 @@ dependencies {
implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.org.burnoutcrew.composereorderable)
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat)
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
implementation(project(mapOf("path" to ":data:userprefs"))) implementation(project(":data:userprefs"))
implementation(project(mapOf("path" to ":data:licenses"))) implementation(project(":data:licenses"))
} }

View File

@ -32,9 +32,9 @@ dependencies {
implementation(libs.com.github.sadellie.themmo) implementation(libs.com.github.sadellie.themmo)
implementation(libs.org.burnoutcrew.composereorderable) implementation(libs.org.burnoutcrew.composereorderable)
implementation(project(mapOf("path" to ":data:common"))) implementation(project(":data:common"))
implementation(project(mapOf("path" to ":data:userprefs"))) implementation(project(":data:userprefs"))
implementation(project(mapOf("path" to ":data:database"))) implementation(project(":data:database"))
implementation(project(mapOf("path" to ":data:timezone"))) implementation(project(":data:timezone"))
implementation(project(mapOf("path" to ":data:model"))) implementation(project(":data:model"))
} }