From d212cee2a47a83e576046009644d189177c9ff63 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Wed, 7 Aug 2024 15:22:26 +0200 Subject: [PATCH] - added pre-compiled plugins - type safe project accessors --- .idea/.name | 1 - build.gradle.kts | 97 +------------------ buildSrc/build.gradle.kts | 1 + .../main/kotlin/trixnity.general.gradle.kts | 10 ++ .../main/kotlin/trixnity.publish.gradle.kts | 90 +++++++++++++++++ settings.gradle.kts | 4 +- test-utils/build.gradle.kts | 5 +- trixnity-api-client/build.gradle.kts | 6 +- trixnity-api-server/build.gradle.kts | 4 +- trixnity-applicationservice/build.gradle.kts | 8 +- .../build.gradle.kts | 4 +- .../build.gradle.kts | 6 +- trixnity-bom/build.gradle.kts | 1 + trixnity-client/build.gradle.kts | 8 +- .../client-repository-test/build.gradle.kts | 4 +- .../integration-tests/build.gradle.kts | 8 +- .../build.gradle.kts | 4 +- .../build.gradle.kts | 4 +- .../build.gradle.kts | 4 +- .../build.gradle.kts | 6 +- .../build.gradle.kts | 6 +- .../build.gradle.kts | 6 +- .../build.gradle.kts | 6 +- .../build.gradle.kts | 8 +- .../build.gradle.kts | 4 +- .../build.gradle.kts | 6 +- trixnity-core/build.gradle.kts | 4 +- trixnity-crypto-core/build.gradle.kts | 4 +- trixnity-crypto/build.gradle.kts | 10 +- trixnity-olm/build.gradle.kts | 4 +- .../build.gradle.kts | 8 +- .../build.gradle.kts | 4 +- .../build.gradle.kts | 6 +- trixnity-utils/build.gradle.kts | 2 + 34 files changed, 207 insertions(+), 146 deletions(-) delete mode 100644 .idea/.name create mode 100644 buildSrc/src/main/kotlin/trixnity.general.gradle.kts create mode 100644 buildSrc/src/main/kotlin/trixnity.publish.gradle.kts diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index a4082f823..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Trixnity diff --git a/build.gradle.kts b/build.gradle.kts index 80934e82d..c1ed4c7df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,108 +7,13 @@ buildscript { plugins { `maven-publish` signing - alias(libs.plugins.dokka) + id(libs.plugins.dokka.get().pluginId) alias(libs.plugins.realm).apply(false) alias(libs.plugins.download).apply(false) alias(libs.plugins.kotest).apply(false) alias(libs.plugins.mokkery).apply(false) } -allprojects { - group = "net.folivo" - version = withVersionSuffix("4.6.2") - - if (System.getenv("WITH_LOCK")?.toBoolean() == true) { - dependencyLocking { - lockAllConfigurations() - } - - val dependenciesForAll by tasks.registering(DependencyReportTask::class) { } - } -} - -subprojects { - if (project.name.startsWith("trixnity-")) { - apply(plugin = "org.jetbrains.dokka") - apply(plugin = "maven-publish") - apply(plugin = "signing") - - val dokkaJar by tasks.registering(Jar::class) { - dependsOn(tasks.dokkaHtml) - from(tasks.dokkaHtml.flatMap { it.outputDirectory }) - archiveClassifier.set("javadoc") - onlyIf { isCI } - } - - publishing { - repositories { - maven { - name = "Release" - val repositoryId = System.getenv("OSSRH_REPOSITORY_ID") - url = uri("https://oss.sonatype.org/service/local/staging/deployByRepositoryId/$repositoryId") - credentials { - username = System.getenv("OSSRH_USERNAME") - password = System.getenv("OSSRH_PASSWORD") - } - } - maven { - url = uri("${System.getenv("CI_API_V4_URL")}/projects/26519650/packages/maven") - name = "Snapshot" - credentials(HttpHeaderCredentials::class) { - name = "Job-Token" - value = System.getenv("CI_JOB_TOKEN") - } - authentication { - create("header", HttpHeaderAuthentication::class) - } - } - } - publications.configureEach { - if (this is MavenPublication) { - pom { - name.set(project.name) - description.set("Multiplatform Kotlin SDK for matrix-protocol") - url.set("https://gitlab.com/trixnity/trixnity") - licenses { - license { - name.set("Apache License 2.0") - url.set("https://www.apache.org/licenses/LICENSE-2.0") - } - } - developers { - developer { - id.set("benkuly") - } - } - scm { - url.set("https://gitlab.com/trixnity/trixnity") - } - } - if (isCI) artifact(dokkaJar) - } - } - } - signing { - isRequired = isRelease - useInMemoryPgpKeys( - System.getenv("OSSRH_PGP_KEY_ID"), - System.getenv("OSSRH_PGP_KEY"), - System.getenv("OSSRH_PGP_PASSWORD") - ) - sign(publishing.publications) - } - // Workaround for gradle issue: - // https://github.com/gradle/gradle/issues/26132 - // https://youtrack.jetbrains.com/issue/KT-61313/Kotlin-MPP-Gradle-Signing-plugin-Task-linkDebugTestLinuxX64-uses-this-output-of-task-signLinuxX64Publication - // https://github.com/gradle/gradle/issues/26091 - // https://youtrack.jetbrains.com/issue/KT-46466/Kotlin-MPP-publishing-Gradle-7-disables-optimizations-because-of-task-dependencies - val signingTasks = tasks.withType() - tasks.withType().configureEach { - mustRunAfter(signingTasks) - } - } -} - val tmpDir = layout.buildDirectory.get().asFile.resolve("tmp") val olmBinariesZipDir = tmpDir.resolve("trixnity-olm-binaries-${libs.versions.trixnityOlmBinaries.get()}.zip") val opensslBinariesZipDir = diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b7a59e5f7..175033941 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,4 +11,5 @@ dependencies { implementation(libs.kotlin.gradle.plugin) implementation(libs.kotlin.gradle.plugin.serialization) implementation(libs.android.gradle.plugin) + implementation("org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.dokka.get()}") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/trixnity.general.gradle.kts b/buildSrc/src/main/kotlin/trixnity.general.gradle.kts new file mode 100644 index 000000000..449cd3fd7 --- /dev/null +++ b/buildSrc/src/main/kotlin/trixnity.general.gradle.kts @@ -0,0 +1,10 @@ +group = "net.folivo" +version = withVersionSuffix("4.6.2") + +if (System.getenv("WITH_LOCK")?.toBoolean() == true) { + dependencyLocking { + lockAllConfigurations() + } + + val dependenciesForAll by tasks.registering(DependencyReportTask::class) { } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/trixnity.publish.gradle.kts b/buildSrc/src/main/kotlin/trixnity.publish.gradle.kts new file mode 100644 index 000000000..8d08f3f4e --- /dev/null +++ b/buildSrc/src/main/kotlin/trixnity.publish.gradle.kts @@ -0,0 +1,90 @@ +import org.jetbrains.dokka.gradle.DokkaTask + +apply(plugin = "org.jetbrains.dokka") +apply(plugin = "maven-publish") +apply(plugin = "signing") + +val dokkaJar by tasks.registering(Jar::class) { + dependsOn(tasks.dokkaHtml) + from(tasks.dokkaHtml.flatMap { it.outputDirectory }) + archiveClassifier.set("javadoc") + onlyIf { isCI } +} + +publishing { + repositories { + maven { + name = "Release" + val repositoryId = System.getenv("OSSRH_REPOSITORY_ID") + url = uri("https://oss.sonatype.org/service/local/staging/deployByRepositoryId/$repositoryId") + credentials { + username = System.getenv("OSSRH_USERNAME") + password = System.getenv("OSSRH_PASSWORD") + } + } + maven { + url = uri("${System.getenv("CI_API_V4_URL")}/projects/26519650/packages/maven") + name = "Snapshot" + credentials(HttpHeaderCredentials::class) { + name = "Job-Token" + value = System.getenv("CI_JOB_TOKEN") + } + authentication { + create("header", HttpHeaderAuthentication::class) + } + } + } + publications.configureEach { + if (this is MavenPublication) { + pom { + name.set(project.name) + description.set("Multiplatform Kotlin SDK for matrix-protocol") + url.set("https://gitlab.com/trixnity/trixnity") + licenses { + license { + name.set("Apache License 2.0") + url.set("https://www.apache.org/licenses/LICENSE-2.0") + } + } + developers { + developer { + id.set("benkuly") + } + } + scm { + url.set("https://gitlab.com/trixnity/trixnity") + } + } + if (isCI) artifact(dokkaJar) + } + } +} +signing { + isRequired = isRelease + useInMemoryPgpKeys( + System.getenv("OSSRH_PGP_KEY_ID"), + System.getenv("OSSRH_PGP_KEY"), + System.getenv("OSSRH_PGP_PASSWORD") + ) + sign(publishing.publications) +} +// Workaround for gradle issue: +// https://github.com/gradle/gradle/issues/26132 +// https://youtrack.jetbrains.com/issue/KT-61313/Kotlin-MPP-Gradle-Signing-plugin-Task-linkDebugTestLinuxX64-uses-this-output-of-task-signLinuxX64Publication +// https://github.com/gradle/gradle/issues/26091 +// https://youtrack.jetbrains.com/issue/KT-46466/Kotlin-MPP-publishing-Gradle-7-disables-optimizations-because-of-task-dependencies +val signingTasks = tasks.withType() +tasks.withType().configureEach { + mustRunAfter(signingTasks) +} + +// manual accessors +val TaskContainer.dokkaHtml: TaskProvider + get() = named("dokkaHtml") + +fun Project.publishing(configure: Action) = extensions.configure("publishing", configure) + +fun Project.signing(configure: Action) = extensions.configure("signing", configure) + +val Project.publishing: PublishingExtension + get() = extensions.getByName("publishing") as PublishingExtension diff --git a/settings.gradle.kts b/settings.gradle.kts index 7078332b7..df3997dbe 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -60,4 +60,6 @@ dependencyResolutionManagement { plugins { id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0") // https://github.com/gradle/foojay-toolchains/tags -} \ No newline at end of file +} + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts index 49a2e51a0..1c9230bff 100644 --- a/test-utils/build.gradle.kts +++ b/test-utils/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general } kotlin { @@ -15,8 +16,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) - api(project(":trixnity-clientserverapi:trixnity-clientserverapi-model")) + api(projects.trixnityCore) + api(projects.trixnityClientserverapi.trixnityClientserverapiModel) implementation(libs.oshai.logging) diff --git a/trixnity-api-client/build.gradle.kts b/trixnity-api-client/build.gradle.kts index f8ca9776f..a1d6f7e4b 100644 --- a/trixnity-api-client/build.gradle.kts +++ b/trixnity-api-client/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) + api(projects.trixnityCore) api(libs.ktor.client.core) implementation(libs.ktor.client.contentNegotiation) @@ -28,7 +30,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":test-utils")) + implementation(projects.testUtils) implementation(libs.ktor.client.mock) implementation(libs.kotest.assertions.core) diff --git a/trixnity-api-server/build.gradle.kts b/trixnity-api-server/build.gradle.kts index 9581daccd..33d769464 100644 --- a/trixnity-api-server/build.gradle.kts +++ b/trixnity-api-server/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -14,7 +16,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) + api(projects.trixnityCore) implementation(libs.ktor.server.core) implementation(libs.ktor.server.contentNegotiation) diff --git a/trixnity-applicationservice/build.gradle.kts b/trixnity-applicationservice/build.gradle.kts index 2ffa09994..c59f5ac04 100644 --- a/trixnity-applicationservice/build.gradle.kts +++ b/trixnity-applicationservice/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -14,8 +16,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-clientserverapi:trixnity-clientserverapi-client")) - api(project(":trixnity-applicationserviceapi:trixnity-applicationserviceapi-server")) + api(projects.trixnityClientserverapi.trixnityClientserverapiClient) + api(projects.trixnityApplicationserviceapi.trixnityApplicationserviceapiServer) implementation(libs.ktor.server.core) implementation(libs.ktor.server.statusPages) @@ -28,7 +30,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":test-utils")) + implementation(projects.testUtils) implementation(libs.kotlinx.coroutines.test) implementation(libs.kotest.assertions.core) diff --git a/trixnity-applicationserviceapi/trixnity-applicationserviceapi-model/build.gradle.kts b/trixnity-applicationserviceapi/trixnity-applicationserviceapi-model/build.gradle.kts index aa3ab1efc..89b75872f 100644 --- a/trixnity-applicationserviceapi/trixnity-applicationserviceapi-model/build.gradle.kts +++ b/trixnity-applicationserviceapi/trixnity-applicationserviceapi-model/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) + api(projects.trixnityCore) implementation(libs.ktor.resources) } diff --git a/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts b/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts index 76e9147a0..14d02f70a 100644 --- a/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts +++ b/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -14,8 +16,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-api-server")) - api(project(":trixnity-applicationserviceapi:trixnity-applicationserviceapi-model")) + api(projects.trixnityApiServer) + api(projects.trixnityApplicationserviceapi.trixnityApplicationserviceapiModel) implementation(libs.ktor.server.core) implementation(libs.ktor.server.contentNegotiation) diff --git a/trixnity-bom/build.gradle.kts b/trixnity-bom/build.gradle.kts index 6ab53eb02..1d6c4a702 100644 --- a/trixnity-bom/build.gradle.kts +++ b/trixnity-bom/build.gradle.kts @@ -1,6 +1,7 @@ plugins { `java-platform` `maven-publish` + trixnity.general } javaPlatform { diff --git a/trixnity-client/build.gradle.kts b/trixnity-client/build.gradle.kts index ba6f83e60..15acfb0dc 100644 --- a/trixnity-client/build.gradle.kts +++ b/trixnity-client/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.kotest) + trixnity.general + trixnity.publish } kotlin { @@ -16,8 +18,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-clientserverapi:trixnity-clientserverapi-client")) - api(project(":trixnity-crypto")) + api(projects.trixnityClientserverapi.trixnityClientserverapiClient) + api(projects.trixnityCrypto) api(libs.koin.core) @@ -33,7 +35,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":test-utils")) + implementation(projects.testUtils) implementation(libs.ktor.client.mock) diff --git a/trixnity-client/client-repository-test/build.gradle.kts b/trixnity-client/client-repository-test/build.gradle.kts index e34a36c2c..bac50e7eb 100644 --- a/trixnity-client/client-repository-test/build.gradle.kts +++ b/trixnity-client/client-repository-test/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.kotest) + trixnity.general + trixnity.publish } kotlin { @@ -16,7 +18,7 @@ kotlin { } commonMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) implementation(libs.oshai.logging) diff --git a/trixnity-client/integration-tests/build.gradle.kts b/trixnity-client/integration-tests/build.gradle.kts index f07736229..71233ad0b 100644 --- a/trixnity-client/integration-tests/build.gradle.kts +++ b/trixnity-client/integration-tests/build.gradle.kts @@ -3,6 +3,8 @@ import org.jetbrains.kotlin.konan.target.HostManager plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -19,9 +21,9 @@ kotlin { commonMain {} commonTest { dependencies { - implementation(project(":trixnity-client")) - implementation(project(":trixnity-client:trixnity-client-repository-exposed")) - implementation(project(":trixnity-client:trixnity-client-repository-realm")) + implementation(projects.trixnityClient) + implementation(projects.trixnityClient.trixnityClientRepositoryExposed) + implementation(projects.trixnityClient.trixnityClientRepositoryRealm) implementation(kotlin("test")) implementation(libs.kotest.common) implementation(libs.kotest.assertions.core) diff --git a/trixnity-client/trixnity-client-media-indexeddb/build.gradle.kts b/trixnity-client/trixnity-client-media-indexeddb/build.gradle.kts index 5a23ee0ea..280eaa4b8 100644 --- a/trixnity-client/trixnity-client-media-indexeddb/build.gradle.kts +++ b/trixnity-client/trixnity-client-media-indexeddb/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -13,7 +15,7 @@ kotlin { } jsMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) api(libs.juulLabs.indexeddb) implementation(libs.oshai.logging) diff --git a/trixnity-client/trixnity-client-media-okio/build.gradle.kts b/trixnity-client/trixnity-client-media-okio/build.gradle.kts index 39cd9311e..1271529f6 100644 --- a/trixnity-client/trixnity-client-media-okio/build.gradle.kts +++ b/trixnity-client/trixnity-client-media-okio/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) api(libs.okio) implementation(libs.oshai.logging) diff --git a/trixnity-client/trixnity-client-media-opfs/build.gradle.kts b/trixnity-client/trixnity-client-media-opfs/build.gradle.kts index f703de27e..87b40224c 100644 --- a/trixnity-client/trixnity-client-media-opfs/build.gradle.kts +++ b/trixnity-client/trixnity-client-media-opfs/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -13,7 +15,7 @@ kotlin { } jsMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) api(project.dependencies.platform(libs.kotlin.wrappers.bom)) api(libs.kotlin.wrappers.browser) diff --git a/trixnity-client/trixnity-client-repository-exposed/build.gradle.kts b/trixnity-client/trixnity-client-repository-exposed/build.gradle.kts index a4f088ab0..75390bc61 100644 --- a/trixnity-client/trixnity-client-repository-exposed/build.gradle.kts +++ b/trixnity-client/trixnity-client-repository-exposed/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -13,7 +15,7 @@ kotlin { } commonMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) implementation(libs.oshai.logging) } @@ -21,7 +23,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":trixnity-client:client-repository-test")) + implementation(projects.trixnityClient.clientRepositoryTest) } } jvmMain { diff --git a/trixnity-client/trixnity-client-repository-indexeddb/build.gradle.kts b/trixnity-client/trixnity-client-repository-indexeddb/build.gradle.kts index f56b9c5d5..30758fe20 100644 --- a/trixnity-client/trixnity-client-repository-indexeddb/build.gradle.kts +++ b/trixnity-client/trixnity-client-repository-indexeddb/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.kotest) + trixnity.general + trixnity.publish } kotlin { @@ -14,7 +16,7 @@ kotlin { } jsMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) implementation(libs.oshai.logging) @@ -24,7 +26,7 @@ kotlin { jsTest { dependencies { implementation(kotlin("test")) - implementation(project(":trixnity-client:client-repository-test")) + implementation(projects.trixnityClient.clientRepositoryTest) } } } diff --git a/trixnity-client/trixnity-client-repository-realm/build.gradle.kts b/trixnity-client/trixnity-client-repository-realm/build.gradle.kts index 7131e419d..0cc394ea0 100644 --- a/trixnity-client/trixnity-client-repository-realm/build.gradle.kts +++ b/trixnity-client/trixnity-client-repository-realm/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.realm) + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) implementation(libs.oshai.logging) @@ -25,7 +27,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":trixnity-client:client-repository-test")) + implementation(projects.trixnityClient.clientRepositoryTest) } } jvmTest { diff --git a/trixnity-client/trixnity-client-repository-room/build.gradle.kts b/trixnity-client/trixnity-client-repository-room/build.gradle.kts index 217ebdb7b..08b517de6 100644 --- a/trixnity-client/trixnity-client-repository-room/build.gradle.kts +++ b/trixnity-client/trixnity-client-repository-room/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.ksp) + trixnity.general + trixnity.publish } kotlin { @@ -19,7 +21,7 @@ kotlin { commonMain { dependencies { - implementation(project(":trixnity-client")) + implementation(projects.trixnityClient) implementation(libs.oshai.logging) @@ -29,7 +31,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":trixnity-client:client-repository-test")) + implementation(projects.trixnityClient.clientRepositoryTest) implementation(libs.androidx.sqlite.bundled) diff --git a/trixnity-clientserverapi/trixnity-clientserverapi-client/build.gradle.kts b/trixnity-clientserverapi/trixnity-clientserverapi-client/build.gradle.kts index 8de7e70d8..1667fe58f 100644 --- a/trixnity-clientserverapi/trixnity-clientserverapi-client/build.gradle.kts +++ b/trixnity-clientserverapi/trixnity-clientserverapi-client/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,8 +17,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-api-client")) - api(project(":trixnity-clientserverapi:trixnity-clientserverapi-model")) + api(projects.trixnityApiClient) + api(projects.trixnityClientserverapi.trixnityClientserverapiModel) implementation(libs.kotlinx.datetime) @@ -29,7 +31,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":test-utils")) + implementation(projects.testUtils) implementation(libs.ktor.client.mock) implementation(libs.kotest.assertions.core) diff --git a/trixnity-clientserverapi/trixnity-clientserverapi-model/build.gradle.kts b/trixnity-clientserverapi/trixnity-clientserverapi-model/build.gradle.kts index 79eac4479..55053e02b 100644 --- a/trixnity-clientserverapi/trixnity-clientserverapi-model/build.gradle.kts +++ b/trixnity-clientserverapi/trixnity-clientserverapi-model/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) + api(projects.trixnityCore) implementation(libs.ktor.resources) diff --git a/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts b/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts index fa08a8f0a..154859836 100644 --- a/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts +++ b/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.mokkery) + trixnity.general + trixnity.publish } kotlin { @@ -15,8 +17,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-api-server")) - api(project(":trixnity-clientserverapi:trixnity-clientserverapi-model")) + api(projects.trixnityApiServer) + api(projects.trixnityClientserverapi.trixnityClientserverapiModel) api(libs.ktor.server.auth) implementation(libs.ktor.server.cors) diff --git a/trixnity-core/build.gradle.kts b/trixnity-core/build.gradle.kts index 931d6a42a..665234115 100644 --- a/trixnity-core/build.gradle.kts +++ b/trixnity-core/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-utils")) + api(projects.trixnityUtils) api(libs.kotlinx.serialization.json) api(libs.ktor.http) implementation(libs.oshai.logging) diff --git a/trixnity-crypto-core/build.gradle.kts b/trixnity-crypto-core/build.gradle.kts index cf19839e3..8efe36e76 100644 --- a/trixnity-crypto-core/build.gradle.kts +++ b/trixnity-crypto-core/build.gradle.kts @@ -7,6 +7,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.kotest) + trixnity.general + trixnity.publish } val opensslBinariesDirs = TrixnityOpensslBinariesDirs(project, libs.versions.trixnityOpensslBinaries.get()) @@ -69,7 +71,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-utils")) + api(projects.trixnityUtils) implementation(libs.oshai.logging) } diff --git a/trixnity-crypto/build.gradle.kts b/trixnity-crypto/build.gradle.kts index d3e50b65a..aa1f96a1f 100644 --- a/trixnity-crypto/build.gradle.kts +++ b/trixnity-crypto/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.kotest) + trixnity.general + trixnity.publish } kotlin { @@ -16,10 +18,10 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) - api(project(":trixnity-crypto-core")) - api(project(":trixnity-olm")) - api(project(":trixnity-clientserverapi:trixnity-clientserverapi-model")) + api(projects.trixnityCore) + api(projects.trixnityCryptoCore) + api(projects.trixnityOlm) + api(projects.trixnityClientserverapi.trixnityClientserverapiModel) implementation(libs.kotlinx.datetime) implementation(libs.oshai.logging) diff --git a/trixnity-olm/build.gradle.kts b/trixnity-olm/build.gradle.kts index 4c7d22bd6..0171112a9 100644 --- a/trixnity-olm/build.gradle.kts +++ b/trixnity-olm/build.gradle.kts @@ -9,6 +9,8 @@ plugins { alias(libs.plugins.download) kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } val olmBinariesDirs = TrixnityOlmBinariesDirs(project, libs.versions.trixnityOlmBinaries.get()) @@ -145,7 +147,7 @@ kotlin { } commonMain { dependencies { - implementation(project(":trixnity-crypto-core")) + implementation(projects.trixnityCryptoCore) implementation(libs.kotlinx.serialization.json) implementation(libs.ktor.utils) implementation(libs.oshai.logging) diff --git a/trixnity-serverserverapi/trixnity-serverserverapi-client/build.gradle.kts b/trixnity-serverserverapi/trixnity-serverserverapi-client/build.gradle.kts index 3fce2a6aa..a37a46bd4 100644 --- a/trixnity-serverserverapi/trixnity-serverserverapi-client/build.gradle.kts +++ b/trixnity-serverserverapi/trixnity-serverserverapi-client/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,8 +17,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-api-client")) - api(project(":trixnity-serverserverapi:trixnity-serverserverapi-model")) + api(projects.trixnityApiClient) + api(projects.trixnityServerserverapi.trixnityServerserverapiModel) implementation(libs.ktor.client.contentNegotiation) implementation(libs.ktor.client.resources) @@ -27,7 +29,7 @@ kotlin { commonTest { dependencies { implementation(kotlin("test")) - implementation(project(":test-utils")) + implementation(projects.testUtils) implementation(libs.ktor.client.mock) implementation(libs.kotest.assertions.core) diff --git a/trixnity-serverserverapi/trixnity-serverserverapi-model/build.gradle.kts b/trixnity-serverserverapi/trixnity-serverserverapi-model/build.gradle.kts index aa3ab1efc..89b75872f 100644 --- a/trixnity-serverserverapi/trixnity-serverserverapi-model/build.gradle.kts +++ b/trixnity-serverserverapi/trixnity-serverserverapi-model/build.gradle.kts @@ -1,6 +1,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + trixnity.general + trixnity.publish } kotlin { @@ -15,7 +17,7 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-core")) + api(projects.trixnityCore) implementation(libs.ktor.resources) } diff --git a/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts b/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts index 770f55730..47aa86dc9 100644 --- a/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts +++ b/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts @@ -2,6 +2,8 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") alias(libs.plugins.mokkery) + trixnity.general + trixnity.publish } kotlin { @@ -15,8 +17,8 @@ kotlin { } commonMain { dependencies { - api(project(":trixnity-api-server")) - api(project(":trixnity-serverserverapi:trixnity-serverserverapi-model")) + api(projects.trixnityApiServer) + api(projects.trixnityServerserverapi.trixnityServerserverapiModel) api(libs.ktor.server.auth) implementation(libs.ktor.server.doubleReceive) diff --git a/trixnity-utils/build.gradle.kts b/trixnity-utils/build.gradle.kts index 584f6db58..83140bdb1 100644 --- a/trixnity-utils/build.gradle.kts +++ b/trixnity-utils/build.gradle.kts @@ -1,5 +1,7 @@ plugins { kotlin("multiplatform") + trixnity.general + trixnity.publish } kotlin { -- GitLab