Trying to fix it again

Kotlin · Jul 11, 2023 · 66b22dc · 66b22dc
1 parent 0333614
commit 66b22dc
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ It has only one function: generate the [Fibonacci sequence](https://en.wikipedia
 1. [x] Clone this repository ot just [use it as template](https://github.com/asm0dey/dummylib-multiplatform/generate)
 2. [ ] Edit project name in [`settings.gradle.kts`](settings.gradle.kts#L17)
 3. [ ] Edit [`groupId` and `version`](convention-plugins/src/main/kotlin/module.publication.gradle.kts#L10-L11)
-    1. If you need the Android support update namespace [there](dummylib/build.gradle.kts#L38) too
-    2. If you don't need an Android support delete the [`android` section](dummylib/build.gradle.kts#L37-L43)
-4. [ ] Edit [build targets you need](dummylib/build.gradle.kts#L9-L21)
+    1. If you need the Android support update namespace [there](library/build.gradle.kts#L38) too
+    2. If you don't need an Android support delete the [`android` section](library/build.gradle.kts#L37-L43)
+4. [ ] Edit [build targets you need](library/build.gradle.kts#L9-L21)
 
 At this stage you given you have everything setup to work with Kotlin Multiplatform the project shoud be buildable (but you might need to provide actual starting values for platforms you need).
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("root.publication")
+    id("publication")
     //trick: for the same plugin versions in all sub-modules
     alias(libs.plugins.androidLibrary).apply(false)
     alias(libs.plugins.kotlinMultiplatform).apply(false)

diff --git a/...main/kotlin/module.publication.gradle.kts → ...ns/src/main/kotlin/publication.gradle.kts b/...main/kotlin/module.publication.gradle.kts → ...ns/src/main/kotlin/publication.gradle.kts
@@ -5,15 +5,24 @@ import org.gradle.kotlin.dsl.`maven-publish`
 plugins {
     `maven-publish`
     signing
+    id("io.github.gradle-nexus.publish-plugin")
 }
 
-group = "com.github.asm0dey"
+group = "com.github.asm0dey.dummylib"
 version = "0.0.1"
 
 val javadocJar by tasks.registering(Jar::class) {
     archiveClassifier.set("javadoc")
 }
 
+nexusPublishing {
+    // Configure maven central repository
+    // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
+    repositories {
+        sonatype()
+    }
+}
+
 publishing {
     // Configure all publications
     publications.withType<MavenPublication> {

diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
diff --git a/dummylib/build.gradle.kts → library/build.gradle.kts b/dummylib/build.gradle.kts → library/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
-    id("module.publication")
 }
 
 kotlin {

diff --git a/...c/androidMain/kotlin/fibiprops.android.kt → ...c/androidMain/kotlin/fibiprops.android.kt b/...c/androidMain/kotlin/fibiprops.android.kt → ...c/androidMain/kotlin/fibiprops.android.kt
diff --git a/...ib/src/androidUnitTest/kotlin/FibiTest.kt → ...ry/src/androidUnitTest/kotlin/FibiTest.kt b/...ib/src/androidUnitTest/kotlin/FibiTest.kt → ...ry/src/androidUnitTest/kotlin/FibiTest.kt
diff --git a/dummylib/src/commonMain/kotlin/CustomFibi.kt → library/src/commonMain/kotlin/CustomFibi.kt b/dummylib/src/commonMain/kotlin/CustomFibi.kt → library/src/commonMain/kotlin/CustomFibi.kt
diff --git a/dummylib/src/iosMain/kotlin/fibiprops.ios.kt → library/src/iosMain/kotlin/fibiprops.ios.kt b/dummylib/src/iosMain/kotlin/fibiprops.ios.kt → library/src/iosMain/kotlin/fibiprops.ios.kt
diff --git a/dummylib/src/iosTest/kotlin/FibiTest.kt → library/src/iosTest/kotlin/FibiTest.kt b/dummylib/src/iosTest/kotlin/FibiTest.kt → library/src/iosTest/kotlin/FibiTest.kt
diff --git a/dummylib/src/jvmMain/kotlin/fibiprops.jvm.kt → library/src/jvmMain/kotlin/fibiprops.jvm.kt b/dummylib/src/jvmMain/kotlin/fibiprops.jvm.kt → library/src/jvmMain/kotlin/fibiprops.jvm.kt
diff --git a/dummylib/src/jvmTest/kotlin/FibiTest.kt → library/src/jvmTest/kotlin/FibiTest.kt b/dummylib/src/jvmTest/kotlin/FibiTest.kt → library/src/jvmTest/kotlin/FibiTest.kt
diff --git a/...linuxX64Main/kotlin/fibiprops.linuxX64.kt → ...linuxX64Main/kotlin/fibiprops.linuxX64.kt b/...linuxX64Main/kotlin/fibiprops.linuxX64.kt → ...linuxX64Main/kotlin/fibiprops.linuxX64.kt
diff --git a/dummylib/src/linuxX64Test/kotlin/FibiTest.kt → library/src/linuxX64Test/kotlin/FibiTest.kt b/dummylib/src/linuxX64Test/kotlin/FibiTest.kt → library/src/linuxX64Test/kotlin/FibiTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,4 +15,4 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "dummylib-multiplatform"
-include(":dummylib")
+include(":library")