diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 4120d12c..88c467b4 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -22,73 +22,73 @@ dependencies { implementation(projects.presentation) // UI (Compose) - implementation(libs.voyagerCore) - implementation(libs.voyagerNavigation) - implementation(libs.voyagerTransitions) - implementation(libs.accompanistPager) - implementation(libs.accompanistPagerIndicators) - implementation(libs.accompanistFlowLayout) + implementation(libs.voyager.core) + implementation(libs.voyager.navigation) + implementation(libs.voyager.transitions) + implementation(libs.accompanist.pager) + implementation(libs.accompanist.pagerIndicators) + implementation(libs.accompanist.flowLayout) implementation(libs.kamel) - implementation(libs.materialDialogsCore) + implementation(libs.materialDialogs.core) // Android - implementation(libs.core) - implementation(libs.appCompat) - implementation(libs.activityCompose) - implementation(libs.work) + implementation(libs.androidx.core) + implementation(libs.androidx.appCompat) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.work) // Android Lifecycle - implementation(libs.lifecycleCommon) - implementation(libs.lifecycleProcess) - implementation(libs.lifecycleRuntime) + implementation(libs.lifecycle.common) + implementation(libs.lifecycle.process) + implementation(libs.lifecycle.runtime) // Threading - implementation(libs.coroutinesCore) - implementation(libs.coroutinesAndroid) + implementation(libs.coroutines.core) + implementation(libs.coroutines.android) // Json - implementation(libs.json) + implementation(libs.serialization.json) // Xml - implementation(libs.xmlUtilCore) - implementation(libs.xmlUtilSerialization) + implementation(libs.serialization.xmlUtil.core) + implementation(libs.serialization.xmlUtil.serialization) // Dependency Injection - implementation(libs.kotlinInjectRuntime) - ksp(libs.kotlinInjectCompiler) + implementation(libs.kotlinInject.runtime) + ksp(libs.kotlinInject.compiler) // Http client - implementation(libs.ktorCore) - implementation(libs.ktorOkHttp) - implementation(libs.ktorSerialization) - implementation(libs.ktorLogging) - implementation(libs.ktorWebsockets) - implementation(libs.ktorAuth) + implementation(libs.ktor.core) + implementation(libs.ktor.okHttp) + implementation(libs.ktor.serialization) + implementation(libs.ktor.logging) + implementation(libs.ktor.websockets) + implementation(libs.ktor.auth) // Logging - implementation(libs.slf4jApi) - implementation(libs.slf4jAndroid) - implementation(libs.ktlogging) + implementation(libs.logging.slf4j.api) + implementation(libs.logging.slf4j.android) + implementation(libs.logging.ktlogging) // Storage implementation(libs.okio) // Preferences - implementation(libs.multiplatformSettingsCore) - implementation(libs.multiplatformSettingsSerialization) - implementation(libs.multiplatformSettingsCoroutines) + implementation(libs.multiplatformSettings.core) + implementation(libs.multiplatformSettings.serialization) + implementation(libs.multiplatformSettings.coroutines) // Utility implementation(libs.krokiCoroutines) // Localization - implementation(libs.mokoCore) - implementation(libs.mokoCompose) + implementation(libs.moko.core) + implementation(libs.moko.compose) // Testing testImplementation(kotlin("test-junit")) testImplementation(compose("org.jetbrains.compose.ui:ui-test-junit4")) - testImplementation(libs.coroutinesTest) + testImplementation(libs.coroutines.test) } android { diff --git a/build.gradle.kts b/build.gradle.kts index 55a80d53..9dbd30d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,39 +4,30 @@ import Config.tachideskVersion import com.codingfeline.buildkonfig.compiler.FieldSpec.Type plugins { - kotlin("multiplatform") version "1.6.10" apply false - kotlin("plugin.serialization") version "1.6.10" apply false - id("com.android.library") version "7.0.4" apply false - id("com.android.application") version "7.0.4" apply false - id("org.jetbrains.compose") version "1.1.0" apply false - id("com.google.devtools.ksp") version "1.6.10-1.0.4" - id("com.github.gmazzo.buildconfig") version "3.0.3" apply false - id("com.codingfeline.buildkonfig") version "0.11.0" apply false - id("dev.icerock.mobile.multiplatform-resources") version "0.18.0" apply false - id("org.jmailen.kotlinter") version "3.9.0" apply false - id("com.github.ben-manes.versions") version "0.42.0" + val libs = libs + alias(libs.plugins.kotlin.multiplatform) apply false + alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.compose) apply false + alias(libs.plugins.ksp) apply false + alias(libs.plugins.buildconfig) apply false + alias(libs.plugins.buildkonfig) apply false + alias(libs.plugins.moko.gradle) apply false + alias(libs.plugins.kotlinter) apply false + alias(libs.plugins.versions) } buildscript { - repositories { - mavenCentral() - } dependencies { - classpath("com.guardsquare:proguard-gradle:7.2.1") { - exclude("com.android.tools.build") - } + // Waiting on https://github.com/Guardsquare/proguard/issues/225 + classpath(libs.proguard) } } allprojects { group = "ca.gosyer" version = "1.2.1" - - repositories { - mavenCentral() - google() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } } tasks.withType { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b70ddf63..27b383f0 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -9,10 +9,6 @@ plugins { group = "ca.gosyer" version = "1.2.1" -repositories { - mavenCentral() -} - kotlin { android { compilations { @@ -41,16 +37,16 @@ kotlin { val commonMain by getting { dependencies { api(kotlin("stdlib-common")) - api(libs.coroutinesCore) - api(libs.json) - api(libs.kotlinInjectRuntime) - api(libs.ktorCore) - api(libs.ktorSerialization) + api(libs.coroutines.core) + api(libs.serialization.json) + api(libs.kotlinInject.runtime) + api(libs.ktor.core) + api(libs.ktor.serialization) api(libs.okio) - api(libs.ktlogging) - api(libs.multiplatformSettingsCore) - api(libs.multiplatformSettingsCoroutines) - api(libs.multiplatformSettingsSerialization) + api(libs.logging.ktlogging) + api(libs.multiplatformSettings.core) + api(libs.multiplatformSettings.coroutines) + api(libs.multiplatformSettings.serialization) } } val commonTest by getting { @@ -80,8 +76,8 @@ kotlin { } dependencies { - add("kspDesktop", libs.kotlinInjectCompiler) - add("kspAndroid", libs.kotlinInjectCompiler) + add("kspDesktop", libs.kotlinInject.compiler) + add("kspAndroid", libs.kotlinInject.compiler) } buildkonfig { diff --git a/data/build.gradle.kts b/data/build.gradle.kts index b3916492..2d38003d 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -33,15 +33,15 @@ kotlin { val commonMain by getting { dependencies { api(kotlin("stdlib-common")) - api(libs.coroutinesCore) - api(libs.json) - api(libs.kotlinInjectRuntime) - api(libs.ktorCore) - api(libs.ktorSerialization) - api(libs.ktorAuth) - api(libs.ktorLogging) - api(libs.ktorWebsockets) - api(libs.ktorOkHttp) + api(libs.coroutines.core) + api(libs.serialization.json) + api(libs.kotlinInject.runtime) + api(libs.ktor.core) + api(libs.ktor.serialization) + api(libs.ktor.auth) + api(libs.ktor.logging) + api(libs.ktor.websockets) + api(libs.ktor.okHttp) api(libs.okio) api(projects.core) api(projects.i18n) @@ -73,8 +73,8 @@ kotlin { } dependencies { - add("kspDesktop", libs.kotlinInjectCompiler) - add("kspAndroid", libs.kotlinInjectCompiler) + add("kspDesktop", libs.kotlinInject.compiler) + add("kspAndroid", libs.kotlinInject.compiler) } buildkonfig { diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 6a937701..af91db49 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -27,69 +27,69 @@ dependencies { implementation(compose.uiTooling) implementation(compose.materialIconsExtended) implementation(compose("org.jetbrains.compose.ui:ui-util")) - implementation(libs.voyagerCore) - implementation(libs.voyagerNavigation) - implementation(libs.voyagerTransitions) - implementation(libs.accompanistPager) - implementation(libs.accompanistPagerIndicators) - implementation(libs.accompanistFlowLayout) + implementation(libs.voyager.core) + implementation(libs.voyager.navigation) + implementation(libs.voyager.transitions) + implementation(libs.accompanist.pager) + implementation(libs.accompanist.pagerIndicators) + implementation(libs.accompanist.flowLayout) implementation(libs.kamel) - implementation(libs.materialDialogsCore) + implementation(libs.materialDialogs.core) // UI (Swing) implementation(libs.darklaf) // Threading - implementation(libs.coroutinesCore) - implementation(libs.coroutinesSwing) + implementation(libs.coroutines.core) + implementation(libs.coroutines.swing) // Json - implementation(libs.json) + implementation(libs.serialization.json) // Xml - implementation(libs.xmlUtilCore) - implementation(libs.xmlUtilSerialization) + implementation(libs.serialization.xmlUtil.core) + implementation(libs.serialization.xmlUtil.serialization) // Dependency Injection - implementation(libs.kotlinInjectRuntime) - ksp(libs.kotlinInjectCompiler) + implementation(libs.kotlinInject.runtime) + ksp(libs.kotlinInject.compiler) // Http client - implementation(libs.ktorCore) - implementation(libs.ktorOkHttp) - implementation(libs.ktorSerialization) - implementation(libs.ktorLogging) - implementation(libs.ktorWebsockets) - implementation(libs.ktorAuth) + implementation(libs.ktor.core) + implementation(libs.ktor.okHttp) + implementation(libs.ktor.serialization) + implementation(libs.ktor.logging) + implementation(libs.ktor.websockets) + implementation(libs.ktor.auth) // Logging - implementation(libs.slf4jApi) - implementation(libs.slf4jJul) - implementation(libs.log4jApi) - implementation(libs.log4jCore) - implementation(libs.log4jSlf4j) - implementation(libs.ktlogging) + implementation(libs.logging.slf4j.api) + implementation(libs.logging.slf4j.jul) + implementation(libs.logging.log4j.api) + implementation(libs.logging.log4j.core) + implementation(libs.logging.log4j.slf4j) + implementation(libs.logging.ktlogging) // Storage implementation(libs.okio) implementation(libs.appDirs) // Preferences - implementation(libs.multiplatformSettingsCore) - implementation(libs.multiplatformSettingsSerialization) - implementation(libs.multiplatformSettingsCoroutines) + implementation(libs.multiplatformSettings.core) + implementation(libs.multiplatformSettings.serialization) + implementation(libs.multiplatformSettings.coroutines) // Utility implementation(libs.krokiCoroutines) // Localization - implementation(libs.mokoCore) - implementation(libs.mokoCompose) + implementation(libs.moko.core) + implementation(libs.moko.compose) // Testing testImplementation(kotlin("test-junit")) testImplementation(compose("org.jetbrains.compose.ui:ui-test-junit4")) - testImplementation(libs.coroutinesTest) + testImplementation(libs.coroutines.test) } java { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 68a1321e..5edd31ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,12 +8,14 @@ json = "1.3.2" xmlUtil = "0.84.1" # Compose +composeGradle = "1.1.0" voyager = "1.0.0-beta16" accompanist = "0.24.4" kamel = "0.3.0" materialDialogs = "0.6.6" # Android +androidGradle = "7.0.4" core = "1.7.0" appCompat = "1.6.0-alpha01" activityCompose = "1.4.0" @@ -26,6 +28,7 @@ lifecycle = "2.5.0-alpha04" darklaf = "2.7.3" # Dependency Injection +ksp = "1.6.10-1.0.4" kotlinInject = "0.4.1" # Network @@ -51,76 +54,120 @@ desugarJdkLibs = "1.1.5" # Localization moko = "0.18.0" +# BuildConfigs +buildconfig = "3.0.3" +buildkonfig = "0.11.0" + +# Linter +kotlinter = "3.9.0" + +# Version updates +versions = "0.42.0" + +# Optimizer +proguard = "7.2.1" + [libraries] # Kotlin -coroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } -coroutinesSwing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" } -coroutinesAndroid = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } -coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } +coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } +coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" } +coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } +coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } # Serialization -json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "json" } -xmlUtilCore = { module = "io.github.pdvrieze.xmlutil:core", version.ref = "xmlUtil" } -xmlUtilSerialization = { module = "io.github.pdvrieze.xmlutil:serialization", version.ref = "xmlUtil" } +serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "json" } +serialization-xmlUtil-core = { module = "io.github.pdvrieze.xmlutil:core", version.ref = "xmlUtil" } +serialization-xmlUtil-serialization = { module = "io.github.pdvrieze.xmlutil:serialization", version.ref = "xmlUtil" } # Compose -voyagerCore = { module = "cafe.adriel.voyager:voyager-core", version.ref = "voyager" } -voyagerNavigation = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } -voyagerTransitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" } -accompanistPager = { module = "ca.gosyer:accompanist-pager", version.ref = "accompanist" } -accompanistPagerIndicators = { module = "ca.gosyer:accompanist-pager-indicators", version.ref = "accompanist" } -accompanistFlowLayout = { module = "ca.gosyer:accompanist-flowlayout", version.ref = "accompanist" } +voyager-core = { module = "cafe.adriel.voyager:voyager-core", version.ref = "voyager" } +voyager-navigation = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } +voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" } +accompanist-pager = { module = "ca.gosyer:accompanist-pager", version.ref = "accompanist" } +accompanist-pagerIndicators = { module = "ca.gosyer:accompanist-pager-indicators", version.ref = "accompanist" } +accompanist-flowLayout = { module = "ca.gosyer:accompanist-flowlayout", version.ref = "accompanist" } kamel = { module = "com.alialbaali.kamel:kamel-image", version.ref = "kamel" } -materialDialogsCore = { module = "ca.gosyer:compose-material-dialogs-core", version.ref = "materialDialogs" } +materialDialogs-core = { module = "ca.gosyer:compose-material-dialogs-core", version.ref = "materialDialogs" } # Android -core = { module = "androidx.core:core-ktx", version.ref = "core" } -appCompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompat" } -activityCompose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } -work = { module = "androidx.work:work-runtime-ktx", version.ref = "work" } +androidx-core = { module = "androidx.core:core-ktx", version.ref = "core" } +androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompat" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } +androidx-work = { module = "androidx.work:work-runtime-ktx", version.ref = "work" } # Android Lifecycle -lifecycleCommon = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } -lifecycleProcess = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" } -lifecycleRuntime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } +lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } +lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" } +lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } # Swing darklaf = { module = "com.github.weisj:darklaf-core", version.ref = "darklaf" } # Dependency Injection -kotlinInjectRuntime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlinInject" } -kotlinInjectCompiler = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlinInject" } +kotlinInject-runtime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlinInject" } +kotlinInject-compiler = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlinInject" } # Network -ktorCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } -ktorOkHttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } -ktorSerialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktor" } -ktorLogging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } -ktorWebsockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" } -ktorAuth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" } +ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-okHttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } +ktor-serialization = { module = "io.ktor:ktor-client-serialization", version.ref = "ktor" } +ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } +ktor-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" } +ktor-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" } # Logging -slf4jApi = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } -slf4jJul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } -slf4jAndroid = { module = "uk.uuid.slf4j:slf4j-android", version.ref = "slf4jAndroid" } -log4jApi = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" } -log4jCore = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } -log4jSlf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" } -ktlogging = { module = "io.github.microutils:kotlin-logging", version.ref = "ktlogging" } +logging-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } +logging-slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } +logging-slf4j-android = { module = "uk.uuid.slf4j:slf4j-android", version.ref = "slf4jAndroid" } +logging-log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" } +logging-log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } +logging-log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" } +logging-ktlogging = { module = "io.github.microutils:kotlin-logging", version.ref = "ktlogging" } # Storage appDirs = { module = "net.harawata:appdirs", version.ref = "appDirs" } okio = { module = "com.squareup.okio:okio", version.ref = "okio" } # Preferences -multiplatformSettingsCore = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" } -multiplatformSettingsSerialization = { module = "com.russhwolf:multiplatform-settings-serialization", version.ref = "multiplatformSettings" } -multiplatformSettingsCoroutines = { module = "com.russhwolf:multiplatform-settings-coroutines", version.ref = "multiplatformSettings" } +multiplatformSettings-core = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" } +multiplatformSettings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization", version.ref = "multiplatformSettings" } +multiplatformSettings-coroutines = { module = "com.russhwolf:multiplatform-settings-coroutines", version.ref = "multiplatformSettings" } # Utility krokiCoroutines = { module = "io.github.kerubistan.kroki:kroki-coroutines", version.ref = "kroki" } desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugarJdkLibs" } # Localization -mokoCore = { module = "dev.icerock.moko:resources", version.ref = "moko" } -mokoCompose = { module = "dev.icerock.moko:resources-compose", version.ref = "moko" } \ No newline at end of file +moko-core = { module = "dev.icerock.moko:resources", version.ref = "moko" } +moko-compose = { module = "dev.icerock.moko:resources-compose", version.ref = "moko" } + +# Optimizer +proguard = { module = "com.guardsquare:proguard-gradle", version.ref = "proguard" } + +[plugins] +# Kotlin +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"} +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"} + +# Android +android-library = { id = "com.android.library", version.ref = "androidGradle"} +android-application = { id = "com.android.application", version.ref = "androidGradle"} + +# Compose +compose = { id = "org.jetbrains.compose", version.ref = "composeGradle"} + +# Dependency Injection +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp"} + +# Localization +moko-gradle = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko"} + +# BuildConfigs +buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig"} +buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfig"} + +# Linter +kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter"} + +# Version updates +versions = { id = "com.github.ben-manes.versions", version.ref = "versions"} \ No newline at end of file diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts index 53215b7e..80796b0a 100644 --- a/i18n/build.gradle.kts +++ b/i18n/build.gradle.kts @@ -29,7 +29,7 @@ kotlin { api(kotlin("stdlib-common")) compileOnly(compose.runtime) compileOnly(compose.ui) - api(libs.mokoCore) + api(libs.moko.core) } } val commonTest by getting { diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 2eae8e22..311e72f6 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -40,15 +40,15 @@ kotlin { val commonMain by getting { dependencies { api(kotlin("stdlib-common")) - api(libs.coroutinesCore) + api(libs.coroutines.core) api(libs.kamel) - api(libs.voyagerCore) - api(libs.voyagerNavigation) - api(libs.voyagerTransitions) - api(libs.materialDialogsCore) - api(libs.accompanistPager) - api(libs.accompanistPagerIndicators) - api(libs.accompanistFlowLayout) + api(libs.voyager.core) + api(libs.voyager.navigation) + api(libs.voyager.transitions) + api(libs.materialDialogs.core) + api(libs.accompanist.pager) + api(libs.accompanist.pagerIndicators) + api(libs.accompanist.flowLayout) api(libs.krokiCoroutines) api(projects.core) api(projects.i18n) @@ -69,7 +69,7 @@ kotlin { val desktopMain by getting { dependencies { api(kotlin("stdlib-jdk8")) - api(libs.coroutinesSwing) + api(libs.coroutines.swing) } } val desktopTest by getting { @@ -78,9 +78,9 @@ kotlin { val androidMain by getting { dependencies { api(kotlin("stdlib-jdk8")) - api(libs.core) - api(libs.appCompat) - api(libs.activityCompose) + api(libs.androidx.core) + api(libs.androidx.appCompat) + api(libs.androidx.activity.compose) } } val androidTest by getting { @@ -89,8 +89,8 @@ kotlin { } dependencies { - add("kspDesktop", libs.kotlinInjectCompiler) - add("kspAndroid", libs.kotlinInjectCompiler) + add("kspDesktop", libs.kotlinInject.compiler) + add("kspAndroid", libs.kotlinInject.compiler) } buildkonfig { diff --git a/settings.gradle.kts b/settings.gradle.kts index 19f6a66a..b4252cb9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,15 @@ pluginManagement { google() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } - +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + google() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } } rootProject.name = "Tachidesk-JUI" diff --git a/ui-core/build.gradle.kts b/ui-core/build.gradle.kts index 2982781f..ecfdd774 100644 --- a/ui-core/build.gradle.kts +++ b/ui-core/build.gradle.kts @@ -34,9 +34,9 @@ kotlin { val commonMain by getting { dependencies { api(kotlin("stdlib-common")) - api(libs.coroutinesCore) + api(libs.coroutines.core) api(libs.kamel) - api(libs.voyagerCore) + api(libs.voyager.core) api(projects.core) api(projects.i18n) api(compose.desktop.currentOs)