Converted core to multiplatform project

gmazzo · Dec 3, 2023 · 8a80acb · 8a80acb
1 parent 39578b7
commit 8a80acb
Show file tree

Hide file tree

Showing 20 changed files with 18 additions and 24 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     base
     alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.gradle.nexusPublish)
     `git-versioning`
 }

diff --git a/buildSrc/src/main/kotlin/maven-central-publish.gradle.kts b/buildSrc/src/main/kotlin/maven-central-publish.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    java
     `maven-publish`
     org.jetbrains.dokka
 }
@@ -19,13 +18,15 @@ if (signingKey != null && signingPassword != null) {
     logger.warn("Artifact signing disabled due lack of signing properties `signingKey` and `signingPassword`")
 }
 
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
+plugins.withId("java") {
+    configure<JavaPluginExtension> {
+        withJavadocJar()
+        withSourcesJar()
+    }
 
-tasks.named<Jar>("javadocJar") {
-    from(tasks.dokkaJavadoc)
+    tasks.named<Jar>("javadocJar") {
+        from(tasks.dokkaJavadoc)
+    }
 }
 
 publishing.publications.withType<MavenPublication>().configureEach {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    alias(libs.plugins.kotlin.jvm)
-    `java-test-fixtures`
+    alias(libs.plugins.kotlin.multiplatform)
     `maven-central-publish`
     jacoco
 }
@@ -9,21 +8,13 @@ description = "CodeOwners Library"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
 
-testing.suites.withType<JvmTestSuite> {
-    useKotlinTest(libs.versions.kotlin)
-    dependencies {
-        implementation(platform(libs.junit.bom))
-    }
+kotlin {
+    jvm()
 }
 
-publishing.publications {
-    create<MavenPublication>("java") { from(components["java"]) }
-}
-
-// disables testFixtures artifact publication
-components.named<AdhocComponentWithVariants>("java") {
-    withVariantsFromConfiguration(configurations.testFixturesApiElements.get()) { skip() }
-    withVariantsFromConfiguration(configurations.testFixturesRuntimeElements.get()) { skip() }
+dependencies {
+    commonTestImplementation(libs.kotlin.test)
+    commonTestImplementation(platform(libs.junit.bom))
 }
 
 publishing.repositories {

diff --git a/core/src/testFixtures/kotlin/bar/Bar.kt → core/src/commonTest/kotlin/bar/Bar.kt b/core/src/testFixtures/kotlin/bar/Bar.kt → core/src/commonTest/kotlin/bar/Bar.kt
diff --git a/...c/testFixtures/kotlin/bar/impl/BarImpl.kt → ...src/commonTest/kotlin/bar/impl/BarImpl.kt b/...c/testFixtures/kotlin/bar/impl/BarImpl.kt → ...src/commonTest/kotlin/bar/impl/BarImpl.kt
diff --git a/core/src/testFixtures/kotlin/baz/Baz.kt → core/src/commonTest/kotlin/baz/Baz.kt b/core/src/testFixtures/kotlin/baz/Baz.kt → core/src/commonTest/kotlin/baz/Baz.kt
diff --git a/core/src/testFixtures/kotlin/foo/Foo.kt → core/src/commonTest/kotlin/foo/Foo.kt b/core/src/testFixtures/kotlin/foo/Foo.kt → core/src/commonTest/kotlin/foo/Foo.kt
diff --git a/...src/testFixtures/kotlin/foo/bar/FooBar.kt → core/src/commonTest/kotlin/foo/bar/FooBar.kt b/...src/testFixtures/kotlin/foo/bar/FooBar.kt → core/src/commonTest/kotlin/foo/bar/FooBar.kt
diff --git a/...ixtures/kotlin/foo/bar/impl/FooBarImpl.kt → ...monTest/kotlin/foo/bar/impl/FooBarImpl.kt b/...ixtures/kotlin/foo/bar/impl/FooBarImpl.kt → ...monTest/kotlin/foo/bar/impl/FooBarImpl.kt
diff --git a/...c/testFixtures/kotlin/foo/impl/FooImpl.kt → ...src/commonTest/kotlin/foo/impl/FooImpl.kt b/...c/testFixtures/kotlin/foo/impl/FooImpl.kt → ...src/commonTest/kotlin/foo/impl/FooImpl.kt
diff --git a/...rc/testFixtures/resources/bar/.codeowners → .../src/commonTest/resources/bar/.codeowners b/...rc/testFixtures/resources/bar/.codeowners → .../src/commonTest/resources/bar/.codeowners
diff --git a/...res/resources/bar/impl/BarImpl.codeowners → ...est/resources/bar/impl/BarImpl.codeowners b/...res/resources/bar/impl/BarImpl.codeowners → ...est/resources/bar/impl/BarImpl.codeowners
diff --git a/...testFixtures/resources/baz/Baz.codeowners → ...c/commonTest/resources/baz/Baz.codeowners b/...testFixtures/resources/baz/Baz.codeowners → ...c/commonTest/resources/baz/Baz.codeowners
diff --git a/...rc/testFixtures/resources/foo/.codeowners → .../src/commonTest/resources/foo/.codeowners b/...rc/testFixtures/resources/foo/.codeowners → .../src/commonTest/resources/foo/.codeowners
diff --git a/...estFixtures/resources/foo/bar/.codeowners → .../commonTest/resources/foo/bar/.codeowners b/...estFixtures/resources/foo/bar/.codeowners → .../commonTest/resources/foo/bar/.codeowners
diff --git a/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt b/...io/github/gmazzo/codeowners/CodeOwners.kt → ...io/github/gmazzo/codeowners/CodeOwners.kt
diff --git a/...ithub/gmazzo/codeowners/CodeOwnersTest.kt → ...ithub/gmazzo/codeowners/CodeOwnersTest.kt b/...ithub/gmazzo/codeowners/CodeOwnersTest.kt → ...ithub/gmazzo/codeowners/CodeOwnersTest.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,6 +10,7 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 android = "com.android.application:8.1.4"
 buildConfig = "com.github.gmazzo.buildconfig:4.2.0"
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-samWithReceiver = { id = "org.jetbrains.kotlin.plugin.sam.with.receiver", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
 gradle-pluginPublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -64,7 +64,7 @@ gradlePlugin {
 buildConfig {
     useKotlinOutput { internalVisibility = true }
     buildConfigField("String", "CORE_DEPENDENCY", projects.core.dependencyProject
-        .publishing.publications.named<MavenPublication>("java").map {
+        .publishing.publications.named<MavenPublication>("kotlinMultiplatform").map {
             "\"${it.groupId}:${it.artifactId}:${it.version}\""
         }
     )

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositoriesMode = RepositoriesMode.PREFER_PROJECT
     repositories {
         mavenCentral()
         google()