From 36a3ed14f87e8936b6a8e9a88d021dcee023db96 Mon Sep 17 00:00:00 2001
From: "Mr. Pine" <git@mr-pine.de>
Date: Wed, 29 Mar 2023 14:32:26 +0200
Subject: [PATCH] Configure release tasks

---
 .gitignore                              |  3 +-
 .idea/gradle.xml                        |  1 +
 build.gradle.kts                        | 12 +++-
 buildSrc/build.gradle.kts               |  7 ++
 buildSrc/src/main/kotlin/PublishData.kt |  7 ++
 buildSrc/src/main/kotlin/artifact.kt    |  5 ++
 scripts/publish-module.gradle           | 92 -------------------------
 scripts/publish-root.gradle             | 34 ---------
 zoomables/build.gradle.kts              | 70 +++++++++++++------
 9 files changed, 81 insertions(+), 150 deletions(-)
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/PublishData.kt
 create mode 100644 buildSrc/src/main/kotlin/artifact.kt
 delete mode 100644 scripts/publish-module.gradle
 delete mode 100644 scripts/publish-root.gradle

diff --git a/.gitignore b/.gitignore
index e9df19a..26449cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@
 local.properties
 /SecretRingKey.gpg
 /secring.gpg
-/zoomables_testing
\ No newline at end of file
+/zoomables_testing
+/buildSrc/src/main/kotlin/myPublishData.kt
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3a0291d..a47b1ae 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/zoomables" />
             <option value="$PROJECT_DIR$/zoomables_testing" />
           </set>
diff --git a/build.gradle.kts b/build.gradle.kts
index e57c3f3..dc9d047 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,4 +11,14 @@ tasks.create<Delete>("clean") {
     delete(rootProject.buildDir)
 }
 
-apply(from = "${rootDir}/scripts/publish-root.gradle")
\ No newline at end of file
+nexusPublishing {
+    this.repositories {
+        sonatype {
+            stagingProfileId.set(publishData.sonatypeStagingProfileId)
+            username.set(publishData.ossrh.username)
+            password.set(publishData.ossrh.password)
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..b22ed73
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/PublishData.kt b/buildSrc/src/main/kotlin/PublishData.kt
new file mode 100644
index 0000000..865f292
--- /dev/null
+++ b/buildSrc/src/main/kotlin/PublishData.kt
@@ -0,0 +1,7 @@
+data class PublishData(val signing: Signing, val artifact: Artifact, val ossrh: OSSRH, val sonatypeStagingProfileId: String)
+
+data class Signing(val keyname: String, val passphrase: String, val executable: String)
+
+data class Artifact(val group: String, val version: String, val id: String)
+
+data class OSSRH(val username: String, val password: String)
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/artifact.kt b/buildSrc/src/main/kotlin/artifact.kt
new file mode 100644
index 0000000..a87449d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/artifact.kt
@@ -0,0 +1,5 @@
+val artifact = Artifact(
+    group = "de.mr-pine.utils",
+    id = "zoomables",
+    version = "1.2.0"
+)
\ No newline at end of file
diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle
deleted file mode 100644
index 8e1581c..0000000
--- a/scripts/publish-module.gradle
+++ /dev/null
@@ -1,92 +0,0 @@
-apply plugin: "maven-publish"
-apply plugin: "signing"
-apply plugin: 'org.jetbrains.dokka'
-
-task androidSourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    if (project.plugins.findPlugin("com.android.library")) {
-        // For Android libraries
-        from android.sourceSets.main.java.srcDirs
-        from android.sourceSets.main.kotlin.srcDirs
-    } else {
-        // For pure Kotlin libraries, in case you have them
-        from sourceSets.main.java.srcDirs
-        from sourceSets.main.kotlin.srcDirs
-    }
-}
-
-task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
-    archiveClassifier.set('javadoc')
-    from dokkaJavadoc.outputDirectory
-}
-
-tasks.withType(dokkaHtmlPartial.getClass()).configureEach {
-    pluginsMapConfiguration.set(
-            ["org.jetbrains.dokka.base.DokkaBase": """{ "separateInheritedMembers": true}"""]
-    )
-}
-
-artifacts {
-    archives androidSourcesJar
-    archives javadocJar
-}
-
-group = PUBLISH_GROUP_ID
-version = PUBLISH_VERSION
-
-afterEvaluate {
-    publishing{
-        publications {
-            release(MavenPublication) {
-                groupId PUBLISH_GROUP_ID
-                artifactId PUBLISH_ARTIFACT_ID
-                version PUBLISH_VERSION
-
-                if (project.plugins.findPlugin("com.android.library")) {
-                    from components.release
-                } else {
-                    from components.java
-                }
-
-                artifact androidSourcesJar
-                artifact javadocJar
-
-                pom {
-                    name = PUBLISH_ARTIFACT_ID
-                    description = 'A library provides Composables that handle nice and smooth zooming behaviour for you'
-                    url = 'https://github.com/Mr-Pine/Zoomables'
-                    licenses {
-                        license {
-                            name = 'Apache License 2.0'
-                            url = 'https://github.com/Mr-Pine/Zoomables/blob/master/LICENSE'
-                        }
-                    }
-                    developers {
-                        developer {
-                            id = 'Mr-Pine'
-                        }
-                        // Add all other devs here...
-                    }
-
-                    // Version control info - if you're using GitHub, follow the
-                    // format as seen here
-                    scm {
-                        connection = 'scm:git:github.com/Mr-Pine/Zoomables.git'
-                        developerConnection = 'scm:git:ssh://github.com/Mr-Pine/Zoomables.git'
-                        url = 'https://github.com/Mr-Pine/Zoomables'
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    /*useInMemoryPgpKeys(
-            rootProject.ext["signing.keyId"],
-            rootProject.ext["signing.secretKeyRingFile"],
-            rootProject.ext["signing.password"],
-    )*/
-    sign publishing.publications
-}
\ No newline at end of file
diff --git a/scripts/publish-root.gradle b/scripts/publish-root.gradle
deleted file mode 100644
index 4cd5d25..0000000
--- a/scripts/publish-root.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-ext["signing.gnupg.keyName"] = ''
-ext["signing.gnupg.passphrase"] = ''
-ext["signing.gnupg.executable"] = ''
-ext["ossrhUsername"] = ''
-ext["ossrhPassword"] = ''
-ext["sonatypeStagingProfileId"] = ''
-
-File secretPropsFile = project.rootProject.file('scripts/local.properties')
-if (secretPropsFile.exists()) {
-    // Read local.properties file first if it exists
-    Properties p = new Properties()
-    new FileInputStream(secretPropsFile).withCloseable { is -> p.load(is) }
-    p.each { name, value -> ext[name] = value }
-} else {
-    // Use system environment variables
-    ext["ossrhUsername"] = System.getenv('OSSRH_USERNAME')
-    ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
-    ext["sonatypeStagingProfileId"] = System.getenv('SONATYPE_STAGING_PROFILE_ID')
-    ext["signing.gnupg.keyName"] = System.getenv('SIGNING_KEY_NAME')
-    ext["signing.gnupg.passphrase"] = System.getenv('SIGNING_PASSPHRASE')
-    ext["signing.gnupg.executable"] = System.getenv('SIGNING_GNUPG_CMD')
-}
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            stagingProfileId = sonatypeStagingProfileId
-            username = ossrhUsername
-            password = ossrhPassword
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-        }
-    }
-}
\ No newline at end of file
diff --git a/zoomables/build.gradle.kts b/zoomables/build.gradle.kts
index 1528f73..0b90c6e 100644
--- a/zoomables/build.gradle.kts
+++ b/zoomables/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     kotlin("android")
     `maven-publish`
     alias(libs.plugins.dokka)
+    signing
 }
 
 android {
@@ -39,7 +40,15 @@ android {
     buildFeatures {
         compose = true
     }
+
     namespace = "de.mr_pine.zoomables"
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 tasks.withType<KotlinCompile> {
@@ -47,7 +56,6 @@ tasks.withType<KotlinCompile> {
 }
 
 dependencies {
-
     implementation(libs.androidx.ktx)
     implementation(libs.compose.ui)
     implementation(libs.compose.ui.util)
@@ -57,29 +65,47 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }
 
-/*ext {
-    PUBLISH_GROUP_ID = "de.mr-pine.utils"
-    PUBLISH_VERSION = "1.1.2"
-    PUBLISH_ARTIFACT_ID = "zoomables"
-}*/
+publishing {
+    publications {
+        register<MavenPublication>("zoomables") {
+            groupId = publishData.artifact.group
+            artifactId = publishData.artifact.id
+            version = publishData.artifact.version
+
+            afterEvaluate {
+                from(components["release"])
+            }
 
-//apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")
+            pom {
+                description.set("A library provides Composables that handle nice and smooth zooming behaviour for you")
+                name.set(publishData.artifact.id)
+                url.set("https://github.com/Mr-Pine/Zoomables")
 
-// Because the components are created only during the afterEvaluate phase, you must
-// configure your publications using the afterEvaluate() lifecycle method.
-/*
-afterEvaluate {
-    publishing {
-        publications {
-            mavenLocal(MavenPublication) {
-                // Applies the component for the release build variant.
-                from(components.release)
-
-                // You can then customize attributes of the publication as shown below.
-                groupId = PUBLISH_GROUP_ID
-                artifactId = PUBLISH_ARTIFACT_ID
-                version = PUBLISH_VERSION
+                licenses {
+                    license {
+                        name.set("Apache License 2.0")
+                        url.set("https://github.com/Mr-Pine/Zoomables/blob/master/LICENSE")
+                    }
+                }
+
+                developers {
+                    developer {
+                        id.set("Mr-Pine")
+                    }
+                }
+
+                scm {
+                    connection.set("scm:git:github.com/Mr-Pine/Zoomables.git")
+                    developerConnection.set("scm:git:ssh://github.com/Mr-Pine/Zoomables.git")
+                    url.set("https://github.com/Mr-Pine/Zoomables")
+                }
             }
         }
+
     }
-}*/
+}
+
+signing {
+    useGpgCmd()
+    sign(publishing.publications)
+}
\ No newline at end of file