Merge pull request #22 from pseudoankit/publish-maven-central-v2

Publish maven central v2
pseudoankit · Jan 25, 2024 · 1f74a57 · 1f74a57
2 parents 4f8a4ac + 2fe0e0c
commit 1f74a57
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 71 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,7 +52,7 @@ dependencies {
         implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0')
     }
 
-    implementation 'io.github.pseudoankit:coachmark:1.0.0'
+    implementation 'io.github.pseudoankit:coachmark:1.0.2'
     implementation 'androidx.activity:activity-compose:1.7.2'
     implementation platform('androidx.compose:compose-bom:2022.10.00')
     implementation 'androidx.compose.ui:ui'

diff --git a/coachmark/build.gradle b/coachmark/build.gradle
@@ -3,10 +3,9 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
-apply from: '../publish-package.gradle'
+apply from: '../gradle/publish-package.gradle'
 
 ext {
-    VERSION_NAME = "1.0.2"
     ARTIFACT_ID = "coachmark"
 }
 

diff --git a/coachmark/consumer-rules.pro b/coachmark/consumer-rules.pro
diff --git a/coachmark/proguard-rules.pro b/coachmark/proguard-rules.pro
diff --git a/publish-package.gradle → gradle/publish-package.gradle b/publish-package.gradle → gradle/publish-package.gradle
@@ -1,40 +1,26 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-task androidJavadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    android.libraryVariants.all { variant ->
-        if (variant.name == 'release') {
-            owner.classpath += variant.javaCompileProvider.get().classpath
-        }
-    }
+ext {
+    GROUP_ID = "io.github.pseudoankit"
+    VERSION_NAME = "1.0.3"
 
-    exclude '**/R.html', '**/R.*.html', '**/index.html'
-    options.encoding 'utf-8'
-    options {
-        addStringOption 'docencoding', 'utf-8'
-        addStringOption 'charset', 'utf-8'
-        links 'https://docs.oracle.com/javase/7/docs/api/'
-        links 'https://d.android.com/reference'
-        links 'https://developer.android.com/reference/androidx/'
-    }
-}
+    POM_DESCRIPTION = "Compose library to add coachmark"
+    POM_URL = "https://github.com/pseudoankit/coachmark"
+    POM_SCM_CONNECTION = "scm:git@github.com:pseudoankit/coachmark.git"
 
-task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-    archiveClassifier.set('javadoc')
-    from androidJavadoc.destinationDir
+    OSS_USERNAME = System.getenv("OSS_USERNAME")
+    OSS_PASSWORD = System.getenv("OSS_PASSWORD")
 
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
 }
 
-task javaSourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from android.sourceSets.main.java.srcDirs
-
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
+signing {
+    useInMemoryPgpKeys(
+            System.getenv("SIGNING_KEY_ID"),
+            System.getenv("SIGNING_KEY"),
+            System.getenv("SIGNING_PASSWORD"),
+    )
+    sign publishing.publications
 }
 
 afterEvaluate {
@@ -45,15 +31,17 @@ afterEvaluate {
                 from components.release
 
                 groupId GROUP_ID
+                artifactId ARTIFACT_ID
                 version VERSION_NAME
+
                 pom {
-                    name = artifactId
+                    name = ARTIFACT_ID
                     description = POM_DESCRIPTION
                     url = POM_URL
                     licenses {
                         license {
-                            name = LICENCE_NAME
-                            url = LICENCE_URL
+                            name = "The Apache Software License, Version 2.0"
+                            url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
                         }
                     }
                     scm {
@@ -103,23 +91,38 @@ afterEvaluate {
     }
 }
 
-ext {
-    GROUP_ID = "io.github.pseudoankit"
+task androidJavadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    android.libraryVariants.all { variant ->
+        if (variant.name == 'release') {
+            owner.classpath += variant.javaCompileProvider.get().classpath
+        }
+    }
 
-    POM_DESCRIPTION = "Compose library to add coachmark"
-    POM_URL = "https://github.com/pseudoankit/coachmark"
-    POM_SCM_CONNECTION = "scm:git@github.com:pseudoankit/coachmark.git"
+    exclude '**/R.html', '**/R.*.html', '**/index.html'
+    options.encoding 'utf-8'
+    options {
+        addStringOption 'docencoding', 'utf-8'
+        addStringOption 'charset', 'utf-8'
+        links 'https://docs.oracle.com/javase/7/docs/api/'
+        links 'https://d.android.com/reference'
+        links 'https://developer.android.com/reference/androidx/'
+    }
+}
 
-    OSS_USERNAME = System.getenv("OSS_USERNAME")
-    OSS_PASSWORD = System.getenv("OSS_PASSWORD")
-    ext."signing.keyId" = System.getenv("SIGNING_KEY_ID")
-    ext."signing.password" = System.getenv("SIGNING_PASSWORD")
-    ext."signing.secretKeyRingFile" = System.getenv("SIGNING_SECRET_KEY_RING_FILE")
+task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
+    archiveClassifier.set('javadoc')
+    from androidJavadoc.destinationDir
 
-    LICENCE_NAME = "The Apache Software License, Version 2.0"
-    LICENCE_URL = "https://www.apache.org/licenses/LICENSE-2.0.txt"
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
 }
 
-signing {
-    sign publishing.publications
-}
+task javaSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+}