diff --git a/backintime-annotations/build.gradle.kts b/backintime-annotations/build.gradle.kts index f7de6850..bb273661 100644 --- a/backintime-annotations/build.gradle.kts +++ b/backintime-annotations/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) alias(libs.plugins.backintimeLint) - `maven-publish` + alias(libs.plugins.mavenPublish) } kotlin { diff --git a/backintime-demo/app/build.gradle.kts b/backintime-demo/app/build.gradle.kts index 6744fa1b..653c8122 100644 --- a/backintime-demo/app/build.gradle.kts +++ b/backintime-demo/app/build.gradle.kts @@ -54,9 +54,9 @@ android { } dependencies { - implementation(project(":backintime-runtime")) - implementation(project(":backintime-annotations")) - implementation(project(":backintime-websocket-event")) + implementation(projects.backintimeRuntime) + implementation(projects.backintimeAnnotations) + implementation(projects.backintimeWebsocketEvent) implementation(libs.core.ktx) implementation(libs.lifecycle.runtime.ktx) implementation(libs.activity.compose) diff --git a/backintime-plugin/common/build.gradle.kts b/backintime-plugin/common/build.gradle.kts index 8b38a0a8..072224f0 100644 --- a/backintime-plugin/common/build.gradle.kts +++ b/backintime-plugin/common/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.kotlinJvm) alias(libs.plugins.backintimeLint) - `maven-publish` + alias(libs.plugins.mavenPublish) } publishing { diff --git a/backintime-plugin/compiler/build.gradle.kts b/backintime-plugin/compiler/build.gradle.kts index ccb368a9..df7795c9 100644 --- a/backintime-plugin/compiler/build.gradle.kts +++ b/backintime-plugin/compiler/build.gradle.kts @@ -3,12 +3,12 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.kotlinSerialization) alias(libs.plugins.backintimeLint) - `maven-publish` + alias(libs.plugins.mavenPublish) } dependencies { - implementation(project(":backintime-plugin:common")) - implementation(project(":backintime-annotations")) + implementation(projects.backintimePlugin.common) + implementation(projects.backintimeAnnotations) implementation(libs.kotlin.stdlib) implementation(libs.kotlin.compiler.embeddable) implementation(libs.kotlinx.serialization.json) diff --git a/backintime-plugin/gradle/build.gradle.kts b/backintime-plugin/gradle/build.gradle.kts index 80032fde..6e4e4056 100644 --- a/backintime-plugin/gradle/build.gradle.kts +++ b/backintime-plugin/gradle/build.gradle.kts @@ -2,8 +2,8 @@ plugins { alias(libs.plugins.kotlinJvm) alias(libs.plugins.kotlinSerialization) alias(libs.plugins.backintimeLint) - `java-gradle-plugin` - `maven-publish` + alias(libs.plugins.javaGradlePlugin) + alias(libs.plugins.mavenPublish) } gradlePlugin { @@ -16,8 +16,8 @@ gradlePlugin { } dependencies { - implementation(project(":backintime-plugin:common")) + implementation(projects.backintimePlugin.common) implementation(libs.kotlin.gradle.plugin.api) implementation(libs.kotlinx.serialization.json) - compileOnly(kotlin("gradle-plugin")) + compileOnly(libs.kotlin.gradle.plugin) } diff --git a/backintime-runtime/build.gradle.kts b/backintime-runtime/build.gradle.kts index e6df9016..f3d9e4e5 100644 --- a/backintime-runtime/build.gradle.kts +++ b/backintime-runtime/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.kotlinSerialization) alias(libs.plugins.androidLibrary) - `maven-publish` + alias(libs.plugins.mavenPublish) } kotlin { @@ -17,8 +17,8 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(project(":backintime-websocket-client")) - implementation(project(":backintime-websocket-event")) + implementation(projects.backintimeWebsocketClient) + implementation(projects.backintimeWebsocketEvent) implementation(libs.ktor.client.core) implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.serialization.json) diff --git a/backintime-websocket-client/build.gradle.kts b/backintime-websocket-client/build.gradle.kts index 96b5a907..898e095e 100644 --- a/backintime-websocket-client/build.gradle.kts +++ b/backintime-websocket-client/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) - `maven-publish` + alias(libs.plugins.mavenPublish) } kotlin { @@ -16,7 +16,7 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(project(":backintime-websocket-event")) + implementation(projects.backintimeWebsocketEvent) implementation(libs.ktor.client.core) implementation(libs.ktor.client.cio) implementation(libs.ktor.client.websockets) diff --git a/backintime-websocket-event/build.gradle.kts b/backintime-websocket-event/build.gradle.kts index 7fc2a275..f0ffa43e 100644 --- a/backintime-websocket-event/build.gradle.kts +++ b/backintime-websocket-event/build.gradle.kts @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.kotlinSerialization) alias(libs.plugins.androidLibrary) - `maven-publish` + alias(libs.plugins.mavenPublish) } kotlin { diff --git a/backintime-websocket-server/build.gradle.kts b/backintime-websocket-server/build.gradle.kts index 6342bef4..a01aa93b 100644 --- a/backintime-websocket-server/build.gradle.kts +++ b/backintime-websocket-server/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) - `maven-publish` + alias(libs.plugins.mavenPublish) } kotlin { @@ -16,7 +16,7 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(project(":backintime-websocket-event")) + implementation(projects.backintimeWebsocketEvent) implementation(libs.kotlinx.coroutines.core) implementation(libs.ktor.server.cio) implementation(libs.ktor.server.websockets) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26d42c2f..20330e91 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -35,6 +35,7 @@ kotlinx-datetime = "0.6.0" ktlint-gradle = { group = "org.jlleitschuh.gradle", name = "ktlint-gradle", version.ref = "ktlint-gradle" } kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-gradle-plugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api", version.ref = "kotlin" } kotlin-compiler-embeddable = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" } kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" } @@ -103,3 +104,5 @@ androidLibrary = { id = "com.android.library", version.ref = "android-library" } kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +mavenPublish = { id = "maven-publish" } +javaGradlePlugin = { id = "java-gradle-plugin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 7aaa57f3..7b2f9fec 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,6 +17,7 @@ dependencyResolutionManagement { } } +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = "backintime" include( diff --git a/test/build.gradle.kts b/test/build.gradle.kts index d5c235ca..899c2321 100644 --- a/test/build.gradle.kts +++ b/test/build.gradle.kts @@ -19,10 +19,10 @@ kotlin { sourceSets { commonMain { dependencies { - implementation(project(":backintime-runtime")) - implementation(project(":backintime-annotations")) - implementation(project(":backintime-websocket-server")) - implementation(project(":backintime-websocket-event")) + implementation(projects.backintimeRuntime) + implementation(projects.backintimeAnnotations) + implementation(projects.backintimeWebsocketServer) + implementation(projects.backintimeWebsocketEvent) implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.serialization.json) }