Update build process

Author: ianrumac

build.gradle.kts

@@ -2,5 +2,5 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
-    id("maven-publish")
+    alias(libs.plugins.vanniktech.maven.publish) apply false
 }

gradle.properties

@@ -20,4 +20,14 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+# Maven Central publishing configuration
+# These properties are read from environment variables in CI/CD
+mavenCentralUsername=${SONATYPE_USERNAME}
+mavenCentralPassword=${SONATYPE_PASSWORD}
+
+# GPG signing configuration for in-memory keys
+signingInMemoryKey=${SIGNING_SECRET_KEY_RING_FILE}
+signingInMemoryKeyId=${SIGNING_KEY_ID}
+signingInMemoryKeyPassword=${SIGNING_PASSWORD}

gradle/libs.versions.toml

@@ -8,6 +8,7 @@ espressoCore = "3.6.1"
 appcompat = "1.7.0"
 material = "1.12.0"
 coroutines = "1.8.1"
+vanniktech-maven-publish = "0.34.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -21,4 +22,5 @@ material = { group = "com.google.android.material", name = "material", version.r
 [plugins]
 android-application = { id = "com.android.library", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-publish" }
 

supercel/build.gradle.kts

@@ -1,17 +1,11 @@
 import groovy.json.JsonBuilder
+import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
-buildscript {
-    extra["awsAccessKeyId"] = System.getenv("AWS_ACCESS_KEY_ID") ?: findProperty("aws_access_key_id")
-    extra["awsSecretAccessKey"] = System.getenv("AWS_SECRET_ACCESS_KEY") ?: findProperty("aws_secret_access_key")
-    extra["sonatypeUsername"] = System.getenv("SONATYPE_USERNAME") ?: findProperty("sonatype_username")
-    extra["sonatypePassword"] = System.getenv("SONATYPE_PASSWORD") ?: findProperty("sonatype_password")
-}
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
-    id("maven-publish")
-    id("signing")
+    alias(libs.plugins.vanniktech.maven.publish)
 }
 
 version = "1.0.0"
@@ -20,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 22
+        minSdk = 21
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -48,80 +42,48 @@ android {
         jvmTarget = "1.8"
     }
 
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
 }
 
 dependencies {
     implementation("net.java.dev.jna:jna:5.17.0@aar")
     implementation(libs.coroutines)
 }
 
-afterEvaluate {
-    publishing {
-        publications {
-            create<MavenPublication>("release") {
-                from(components["release"])
-                groupId = "com.superwall.supercel"
-                artifactId = "supercel"
-                version = project.version.toString() // Set your library version
-
-                pom {
-                    name.set("SuperCEL")
-                    description.set("Superwall CEL Evaluator")
-                    url.set("https://superwall.com")
-
-                    licenses {
-                        license {
-                            name.set("MIT License")
-                            url.set("https://github.com/superwall/Superwall-Android?tab=MIT-1-ov-file#")
-                        }
-                    }
-                    developers {
-                        developer {
-                            id.set("ianrumac")
-                            name.set("Ian Rumac")
-                            email.set("ian@superwall.com")
-                        }
-                    }
-                    scm {
-                        connection.set("scm:git:git@github.com:superwall/SuperCEL-Android.git")
-                        developerConnection.set("scm:git:ssh://github.com:superwall/SuperCEL-Android.git")
-                        url.set("scm:git:https://github.com/superwall/SuperCEL-Android.git")
-                    }
-                }
+mavenPublishing {
+    coordinates("com.superwall.supercel", "supercel", project.version.toString())
+
+    pom {
+        name.set("SuperCEL")
+        description.set("Superwall CEL Evaluator")
+        inceptionYear.set("2024")
+        url.set("https://superwall.com")
+        licenses {
+            license {
+                name.set("MIT License")
+                url.set("https://github.com/superwall/Superwall-Android?tab=MIT-1-ov-file#")
+                distribution.set("https://github.com/superwall/Superwall-Android?tab=MIT-1-ov-file#")
             }
         }
-
-        repositories {
-            mavenLocal()
-
-            val sonatypeUsername: String? by extra
-            val sonatypePassword: String? by extra
-
-            if (sonatypeUsername != null && sonatypePassword != null) {
-                maven {
-                    url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-                    credentials(PasswordCredentials::class.java) {
-                        username = sonatypeUsername
-                        password = sonatypePassword
-                    }
-                }
+        developers {
+            developer {
+                id.set("ianrumac")
+                name.set("Ian Rumac")
+                email.set("ian@superwall.com")
+                url.set("https://superwall.com")
             }
         }
+        scm {
+            url.set("https://github.com/superwall/SuperCEL-Android")
+            connection.set("scm:git:git://github.com/superwall/SuperCEL-Android.git")
+            developerConnection.set("scm:git:ssh://git@github.com/superwall/SuperCEL-Android.git")
+        }
     }
 
-
-    signing {
-        val signingKeyId: String? = System.getenv("SIGNING_KEY_ID")
-        val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
-        val signingSecretKeyRingFile: String? = System.getenv("SIGNING_SECRET_KEY_RING_FILE")
-        useInMemoryPgpKeys(signingKeyId, signingSecretKeyRingFile, signingPassword )
-        sign(publishing.publications["release"])
-    }
+    configure(AndroidSingleVariantLibrary())
+    
+    publishToMavenCentral()
+    
+    signAllPublications()
 }
 
 tasks.register("generateBuildInfo") {