Improved snapshot uploading to maven.

* We have added the `SNAPSHOT` env variable in publish_snapshot.yml and match it our code if found then it means this workflow trigged to publish the snapshot on maven so on behalf of this we have rectify our code.

Author: MohitMaliDeveloper

.github/workflows/publish_snapshot.yml

@@ -29,16 +29,22 @@ jobs:
         run: |
           ./gradlew buildHeaders build
 
+      - name: Release build
+        run: |
+          ./gradlew assemble    
+
       - name: Generate Source jar
         run: |
           ./gradlew androidSourcesJar
 
       - name: Publish Snapshot to MavenCentral
-        run: ./gradlew publishToSonatype --info
+        run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          SNAPSHOT: true
 

build.gradle

@@ -20,20 +20,3 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
-}
-// Publish to Maven Central
-nexusPublishing {
-    repositories {
-        sonatype {
-            stagingProfileId = properties.getProperty("sonatypeStagingProfileId", System.getenv('SONATYPE_STAGING_PROFILE_ID'))
-            username = properties.getProperty("ossrhUsername", System.getenv('OSSRH_USERNAME'))
-            password = properties.getProperty("ossrhPassword", System.getenv('OSSRH_PASSWORD'))
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-    }
-}
-}

lib/build.gradle

@@ -15,13 +15,34 @@ ext["key"] = properties.getProperty("signing.key", System.getenv('SIGNING_KEY'))
 ext["ossrhUsername"] = properties.getProperty("ossrhUsername", System.getenv('OSSRH_USERNAME'))
 ext["ossrhPassword"] = properties.getProperty("ossrhPassword", System.getenv('OSSRH_PASSWORD'))
 ext["sonatypeStagingProfileId"] = properties.getProperty("sonatypeStagingProfileId", System.getenv('SONATYPE_STAGING_PROFILE_ID'))
+ext["snapshot"] = System.getenv('SNAPSHOT') ?: false
 
 ext {
     set("GROUP_ID", "org.kiwix.libkiwix")
     set("ARTIFACT_ID", "libkiwix")
     set("VERSION", "1.0.0")
 }
 
+if (snapshot) {
+    ext["VERSION_CODE"] = VERSION + "-SNAPSHOT"
+} else {
+    ext["VERSION_CODE"] = VERSION
+}
+
+// Publish to Maven Central
+nexusPublishing {
+    repositories {
+        sonatype {
+            stagingProfileId = properties.getProperty("sonatypeStagingProfileId", System.getenv('SONATYPE_STAGING_PROFILE_ID'))
+            username = properties.getProperty("ossrhUsername", System.getenv('OSSRH_USERNAME'))
+            password = properties.getProperty("ossrhPassword", System.getenv('OSSRH_PASSWORD'))
+            version = VERSION_CODE
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+        }
+    }
+}
+
 // Replace these versions with the latest available versions of libkiwix and libzim
 ext.libkiwix_version = "12.0.0"
 ext.libzim_version = "8.2.0"

lib/publish.gradle

@@ -22,7 +22,7 @@ def siteUrl = 'https://www.kiwix.org/en/'
 def gitUrl = 'https://github.com/kiwix/libkiwix.git'
 
 group = GROUP_ID
-version = VERSION
+version = VERSION_CODE
 
 afterEvaluate {
     publishing {
@@ -31,7 +31,7 @@ afterEvaluate {
 
                 groupId GROUP_ID
                 artifactId ARTIFACT_ID
-                version VERSION
+                version VERSION_CODE
 
                 from components.release
 
@@ -61,19 +61,6 @@ afterEvaluate {
                 }
             }
         }
-        repositories {
-            maven {
-                if (VERSION.endsWith('-SNAPSHOT')) {
-                    url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-                } else {
-                    url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-                }
-                credentials {
-                    username = ossrhUsername
-                    password = ossrhPassword
-                }
-            }
-        }
     }
 }