Swap Wupdigital Publishing Plugin for Vanniktech (#244)

* Remove extra space in circle ci restore_cache checksum

* Fix markdownlint errors

* Disable daemon to prevent looping behavior in publish task
  - from readme of vanniktech/gradle-maven-publish-plugin

* Remove extra deploy step in .yml

* Swap out gradle maven publish plugin: wupdigital -> vanniktech

* remove PORG prefixes, only needed if using env variable (not when -P passing)

* Add mavenCentral to second repositories block

* Adjust quotes in apply plugin

* Update circleCI env variables for vanniktech plugin

* Update AGP and Gradle to fix moshi resolution problem

* Remove redundancy gradle.properties

* Migrate to vanniktech plugin

Author: Mark Han

.circleci/config.yml

@@ -69,7 +69,7 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "develop" ]; then
               echo "$MAVEN_CENTRAL_SEC_RING" | base64 -d > $HOME/secring.gpg
               gpg --import --batch $HOME/secring.gpg
-              ./gradlew clean publish -Psonatype.username="$SONATYPE_USERNAME" -Psonatype.password="$SONATYPE_PASSWORD" -Psigning.keyId=0E7A8B89 -Psigning.password="$MAVEN_CENTRAL_KEY_PASSPHRASE" -Psigning.secretKeyRingFile=$HOME/secring.gpg -Porg.gradle.parallel=false -Porg.gradle.daemon=false
+              ./gradlew publish -PORG_GRADLE_PROJECT_mavenCentralUsername="$SONATYPE_USERNAME" -PORG_GRADLE_PROJECT_mavenCentralPassword="$SONATYPE_PASSWORD" -Psigning.keyId=0E7A8B89 -Psigning.password="$MAVEN_CENTRAL_KEY_PASSPHRASE" -Psigning.secretKeyRingFile=$HOME/secring.gpg -Porg.gradle.parallel=false -Porg.gradle.daemon=false
             fi
 
 workflows:

build.gradle

@@ -20,19 +20,19 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'digital.wup:android-maven-publish:3.6.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.22.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

gradle.properties

@@ -18,4 +18,4 @@ org.gradle.parallel=true
 # enable after fix https://github.com/gradle/gradle/issues/4848
 org.gradle.configureondemand=false
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu May 09 15:48:22 EDT 2019
+#Thu Oct 27 17:02:53 EDT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

publish.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'signing'
-apply plugin: 'digital.wup.android-maven-publish'
+apply plugin: 'com.vanniktech.maven.publish'
 
 task sourcesJar(type: Jar) {
     classifier = 'sources'
@@ -19,38 +19,45 @@ task javadocsJar(type: Jar) {
 def siteUrl = 'https://github.com/willowtreeapps/Hyperion-Android'
 def gitUrl = 'https://github.com/willowtreeapps/Hyperion-Android.git'
 
-publishing {
-    publications {
-        lib(MavenPublication) {
-            from components.android
-            artifact sourcesJar
-            artifact javadocsJar
+group = project.libraryGroup
+version = project.libraryVersion
 
-            pom {
-                name = project.name
-                description = 'App Debugging & Inspection Tool for Android'
-                url = siteUrl
-                licenses {
-                    license {
-                        name = 'The Apache Software License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        distribution = 'repo'
-                    }
-                }
-                developers {
-                    developer {
-                        id = 'kritarie'
-                        name = 'Sean Amos'
-                    }
-                }
-                scm {
-                    connection = gitUrl
-                    developerConnection = gitUrl
-                    url = siteUrl
-                }
+mavenPublishing {
+    // // True enables both closing and releasing the plugin https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/docs/central.md
+    // ./gradlew publishAllPublicationsToMavenCentral
+    // ./gradlew closeAndReleaseRepository
+    // publishToMavenCentral("DEFAULT", true) to do both
+    publishToMavenCentral("DEFAULT")
+    signAllPublications()
+    pom {
+//        from components.android
+//        artifact sourcesJar
+//        artifact javadocsJar
+        name = project.name
+        description = 'App Debugging & Inspection Tool for Android'
+        url = siteUrl
+        licenses {
+            license {
+                name = 'The Apache Software License, Version 2.0'
+                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                distribution = 'repo'
+            }
+        }
+        developers {
+            developer {
+                id = 'kritarie'
+                name = 'Sean Amos'
             }
         }
+        scm {
+            connection = gitUrl
+            developerConnection = gitUrl
+            url = siteUrl
+        }
     }
+}
+
+publishing {
     repositories {
         maven {
             def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
@@ -62,8 +69,4 @@ publishing {
             }
         }
     }
-}
-
-signing {
-    sign publishing.publications.lib
 }