Merge pull request #129 from rafsanjani/develop

Optimise maven publication releases
rafsanjani · Nov 22, 2024 · e6688f1 · e6688f1
2 parents 2b14db3 + 555cb33
commit e6688f1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,9 +2,6 @@ name: Publish to Maven Central
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - '*'
 
 jobs:
   deploy:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
     id("root.publication")
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.dokka) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ktlint)
-    signing
 }
 
 apply {

diff --git a/convention-plugins/settings.gradle.kts b/convention-plugins/settings.gradle.kts
@@ -19,3 +19,5 @@ dependencyResolutionManagement {
         }
     }
 }
+
+rootProject.name = "convention-plugins"
diff --git a/convention-plugins/src/main/kotlin/com/foreverrafs/datepickertimeline/ModulePublication.kt b/convention-plugins/src/main/kotlin/com/foreverrafs/datepickertimeline/ModulePublication.kt
@@ -23,7 +23,7 @@ class ModulePublication : Plugin<Project> {
             applyPlugins()
             val dokkaOutputDir = layout.buildDirectory.dir("dokka").get().asFile
 
-            val deleteDokkaOutputDir = tasks.register<Delete>("deleteDokkaOutputDirectory") {
+            val deleteDokkaOutputDir by tasks.register<Delete>("deleteDokkaOutputDirectory") {
                 delete(dokkaOutputDir)
             }
 
@@ -34,17 +34,9 @@ class ModulePublication : Plugin<Project> {
             }
 
             publishing {
-                // Configure all publications
                 publications.withType<MavenPublication> {
-                    val mavenPublication = this as? MavenPublication
-
                     artifact(javadocJar)
 
-                    mavenPublication?.artifactId =
-                        "datepickertimeline${
-                            "-$name".takeUnless { "kotlinMultiplatform" in name }.orEmpty()
-                        }".removeSuffix("Release")
-
                     pom {
                         name.set("Datepicker Timeline")
                         description.set("A linear date picker for jetpack compose multiplatform")
@@ -82,6 +74,19 @@ class ModulePublication : Plugin<Project> {
             tasks.withType(AbstractPublishToMaven::class.java).configureEach {
                 dependsOn(tasks.withType(Sign::class.java))
             }
+
+            afterEvaluate {
+                publishing {
+                    publications.withType<MavenPublication>().configureEach {
+                        artifactId = buildString {
+                            append(project.name)
+                            if (!name.contains("kotlinMultiplatform")) {
+                                append("-$name")
+                            }
+                        }.removeSuffix("Release")
+                    }
+                }
+            }
         }
     }
 }

diff --git a/convention-plugins/src/main/kotlin/com/foreverrafs/datepickertimeline/RootPublication.kt b/convention-plugins/src/main/kotlin/com/foreverrafs/datepickertimeline/RootPublication.kt
@@ -6,13 +6,37 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 
 class RootPublication : Plugin<Project> {
+    private fun getCurrentBranch(): String {
+        val command = listOf(
+            "git",
+            "rev-parse",
+            "--abbrev-ref",
+            "HEAD",
+        )
+        val process = ProcessBuilder(command).start()
+
+        val output = process.inputStream.bufferedReader().use { it.readText() }
+        return output
+    }
+
+    private fun getLibraryVersion(): String {
+        val nextReleaseVersion = "3.0.0"
+        val currentBranch = getCurrentBranch()
+
+        // develop branch is for snapshots whilst main is for releases
+        return if (currentBranch == "develop") {
+            "$nextReleaseVersion-SNAPSHOT"
+        } else {
+            nextReleaseVersion
+        }
+    }
+
     override fun apply(target: Project) {
         with(target) {
             pluginManager.apply("io.github.gradle-nexus.publish-plugin")
-
-            target.allprojects {
+            allprojects {
                 group = "io.github.rafsanjani"
-                version = "1.2.2-SNAPSHOT"
+                version = getLibraryVersion()
             }
 
             nexusPublishing {
@@ -21,13 +45,8 @@ class RootPublication : Plugin<Project> {
                         val mavenCentralUsername = System.getenv("MAVEN_CENTRAL_USERNAME")
                         val mavenCentralPassword = System.getenv("MAVEN_CENTRAL_PASSWORD")
 
-                        nexusUrl.set(
-                            if (version.toString().endsWith("SNAPSHOT")) {
-                                uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-                            } else {
-                                uri("https://s01.oss.sonatype.org/service/local/")
-                            },
-                        )
+                        snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+                        nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
 
                         username.set(mavenCentralUsername)
                         password.set(mavenCentralPassword)

diff --git a/datepickertimeline/build.gradle.kts b/datepickertimeline/build.gradle.kts
@@ -6,13 +6,8 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.compose.compiler)
-    id("org.jetbrains.dokka") version "1.9.20"
-    `maven-publish`
-    signing
 }
 
-version = "1.0.0"
-
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     androidTarget()
@@ -72,17 +67,4 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
         sourceCompatibility = JavaVersion.VERSION_17
     }
-
-    afterEvaluate {
-        configure<PublishingExtension> {
-            publications.all {
-                val mavenPublication = this as? MavenPublication
-
-                mavenPublication?.artifactId =
-                    "datepickertimeline${
-                        "-$name".takeUnless { "kotlinMultiplatform" in name }.orEmpty()
-                    }".removeSuffix("Release")
-            }
-        }
-    }
 }