Refactoring to match modern standards

.github/workflows/deploy.yml

@@ -20,14 +20,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: publishKotlinMultiplatformPublicationToSonatypeRepository
-            os: macos-latest
           - target: publishIosArm64PublicationToSonatypeRepository
             os: macos-latest
-          - target: publishIosSimulatorArm64PublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishAndroidDebugPublicationToSonatypeRepository
-            os: ubuntu-latest
           - target: publishAndroidReleasePublicationToSonatypeRepository
             os: ubuntu-latest
           - target: publishJvmPublicationToSonatypeRepository

.gitignore

@@ -1,6 +1,10 @@
-/.idea/
-/build/
-/.gradle/
-/convention-plugins/.gradle/
-/convention-plugins/build/
-.envrc
+*.iml
+.gradle
+.idea
+.DS_Store
+build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+xcuserdata

build.gradle.kts

@@ -1,67 +1,7 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-
 plugins {
-    kotlin("multiplatform") version "1.9.0"
-    id("com.android.library")
-    id("convention.publication")
-}
-
-group = "com.github.asm0dey"
-version = "0.0.1.2"
-
-repositories {
-    google()
-    mavenCentral()
-}
-
-@OptIn(ExperimentalKotlinGradlePluginApi::class)
-kotlin {
-    targetHierarchy.default()
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-        testRuns["test"].executionTask.configure {
-            useJUnitPlatform()
-        }
-    }
-    android {
-        publishLibraryVariants("release", "debug")
-    }
-    iosArm64 {
-        binaries {
-            framework {
-                baseName = "library"
-            }
-        }
-    }
-    iosSimulatorArm64() {
-        binaries {
-            framework {
-                baseName = "library"
-            }
-        }
-    }
-    linuxX64()
-    sourceSets {
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test"))
-            }
-        }
-    }
-}
-
-android {
-    namespace = "com.github.asm0dey.dummylib"
-    compileSdk = 33
-    defaultConfig {
-        minSdk = 24
-        targetSdk = 33
-    }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-        }
-    }
+    id("root.publication")
+    id("module.publication")
+    //trick: for the same plugin versions in all sub-modules
+    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.kotlinMultiplatform).apply(false)
 }

convention-plugins/build.gradle.kts

@@ -1,11 +1,7 @@
 plugins {
-    `kotlin-dsl` // Is needed to turn our build logic written in Kotlin into the Gradle Plugin
-}
-
-repositories {
-    gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin
+    `kotlin-dsl`
 }
 
 dependencies {
-    implementation("io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:2.0.0-rc-1")
+    implementation(libs.nexus.publish)
 }

convention-plugins/settings.gradle.kts

@@ -0,0 +1,21 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

convention-plugins/src/main/kotlin/convention.publication.gradle.kts → convention-plugins/src/main/kotlin/module.publication.gradle.kts

@@ -1,30 +1,21 @@
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.`maven-publish`
-import org.gradle.kotlin.dsl.signing
 
 plugins {
     `maven-publish`
     signing
-    id("io.github.gradle-nexus.publish-plugin")
 }
 
+group = "com.github.asm0dey.dummylib"
+version = "0.0.1"
 
 val javadocJar by tasks.registering(Jar::class) {
     archiveClassifier.set("javadoc")
 }
 
-nexusPublishing {
-    // Configure maven central repository
-    repositories {
-        sonatype()
-    }
-
-
-    // Configure all publications
-}
-
 publishing {
+    // Configure all publications
     publications.withType<MavenPublication> {
         // Stub javadoc.jar artifact
         artifact(javadocJar.get())
@@ -55,10 +46,9 @@ publishing {
     }
 }
 
-val gpgKeyId by extra { System.getenv("secrets.OSSRH_GPG_SECRET_KEY_ID") }
-val gpgKey by extra { System.getenv("secrets.OSSRH_GPG_SECRET_KEY") }
-val gpgKeyPassword by extra { System.getenv("secrets.OSSRH_GPG_SECRET_KEY_PASSWORD") }
 signing {
-    useGpgCmd()
-    sign(publishing.publications)
-}
+    if (project.hasProperty("signing.gnupg.keyName")) {
+        useGpgCmd()
+        sign(publishing.publications)
+    }
+}

convention-plugins/src/main/kotlin/root.publication.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    id("io.github.gradle-nexus.publish-plugin")
+}
+
+nexusPublishing {
+    // Configure maven central repository
+    // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
+    repositories {
+        sonatype()
+    }
+}

gradle.properties

@@ -1,8 +1,14 @@
-kotlin.code.style=official
-kotlin.mpp.androidSourceSetLayoutVersion=2
-android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4096m
-# Improves build time via enabling the gradle build cache
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.caching=true
-org.gradle.configuration-cache=true
 
+#Kotlin
+kotlin.code.style=official
+kotlin.js.compiler=ir
+
+#MPP
+kotlin.mpp.enableCInteropCommonization=true
+
+#Android
+android.useAndroidX=true
+android.nonTransitiveRClass=true

gradle/libs.versions.toml

@@ -0,0 +1,14 @@
+[versions]
+agp = "8.0.2"
+kotlin = "1.9.0"
+nexus-publish = "2.0.0-rc-1"
+android-minSdk = "24"
+android-compileSdk = "33"
+
+[libraries]
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+nexus-publish = { module = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin", version.ref = "nexus-publish" }
+
+[plugins]
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidLibrary)
+    id("module.publication")
+}
+
+kotlin {
+    targetHierarchy.default()
+    jvm()
+    androidTarget {
+        publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    linuxX64()
+
+    sourceSets.commonMain.get().dependencies {
+        //put your multiplatform dependencies here
+    }
+    sourceSets.commonTest.get().dependencies {
+        implementation(libs.kotlin.test)
+    }
+}
+
+android {
+    namespace = "com.github.asm0dey.dummylib"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    defaultConfig {
+        minSdk = libs.versions.android.minSdk.get().toInt()
+    }
+}

src/iosSimulatorArm64Test/kotlin/FibiTest.kt → library/src/iosTest/kotlin/FibiTest.kt

@@ -6,4 +6,4 @@ class FibiTest {
     fun `test 3rd element`(){
        assertEquals(7, fibi.take(3).last())
     }
-}
+}

settings.gradle.kts

@@ -1,16 +1,22 @@
 pluginManagement {
+    includeBuild("convention-plugins")
     repositories {
-        google()
-        gradlePluginPortal()
-        mavenCentral()
-    }
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.namespace == "com.android") {
-                useModule("com.android.tools.build:gradle:7.4.1")
+        google {
+            mavenContent {
+                releasesOnly()
             }
         }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
     }
 }
+
 rootProject.name = "dummylib-multiplatform"
-includeBuild("convention-plugins")
+include(":library")