publish to OSSRH (#115)

Author: joebowbeer

.github/workflows/android.yml

@@ -1,6 +1,14 @@
 name: Android CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+    paths-ignore:
+    - '**/README.md'
+  pull_request:
+    branches:
+    - master
 
 jobs:
   build:
@@ -20,3 +28,10 @@ jobs:
       with:
         name: pd-core-aar
         path: PdCore/build/outputs/aar
+    - if: github.event_name == 'push'
+      run: ./gradlew publishToSonatype
+      env:
+        ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+        ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+        #ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
+        #ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}

.gitignore

@@ -33,6 +33,7 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+.settings/org.eclipse.buildship.core.prefs
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -45,3 +46,6 @@ proguard/
 
 # NetBeans project files
 .nb-gradle/
+
+# Code
+.vscode/settings.json

PdCore/build.gradle

@@ -1,17 +1,17 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-import org.apache.tools.ant.taskdefs.condition.Os
+plugins {
+    id 'com.android.library'
+    id 'signing'
+    id 'maven-publish'
+}
 
-version = '1.2.1-rc2'
-group = 'org.puredata.android'
+group = rootProject.group
 archivesBaseName = 'pd-core'
+version = rootProject.version
 
 dependencies {
     api 'com.noisepages.nettoyeur:midi:1.0.0-rc1'
     implementation 'com.noisepages.nettoyeur:midi:1.0.0-rc1'
-    implementation "androidx.legacy:legacy-support-v4:" + rootProject.androidxLegacySupportVersion
+    implementation 'androidx.legacy:legacy-support-v4:' + rootProject.androidxLegacySupportVersion
 }
 
 android {
@@ -78,11 +78,13 @@ android {
 
     libraryVariants.all { variant ->
         variant.outputs.all { output ->
-            outputFileName = "${archivesBaseName}-${version}.aar"
+            outputFileName = "${archivesBaseName}.aar"
         }
     }
 }
 
+import org.apache.tools.ant.taskdefs.condition.Os
+
 // TODO: Move to convention plugin?
 def getNdkBuildExecutablePath() {
     // android.ndkDirectory should return project.android.ndkVersion ndkDirectory
@@ -95,49 +97,19 @@ def getNdkBuildExecutablePath() {
     return ndkBuildFullPath
 }
 
-def siteUrl = 'https://github.com/libpd/pd-for-android'
-def gitUrl = 'https://github.com/libpd/pd-for-android.git'
-
-install {
-    repositories.mavenInstaller {
-
-        pom {
-            project {
-                packaging 'aar'
-
-                name 'Pure Data for Android'
-                url siteUrl
-
-                licenses {
-                    license {
-                        name 'BSD New'
-                        url 'https://raw.githubusercontent.com/libpd/pd-for-android/master/PdCore/LICENSE.txt'
-                    }
-                }
-
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-
-                }
-            }
-        }
-    }
-}
-
 task sourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
 }
 
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    failOnError = false // TODO: fix javadoc issues
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 
@@ -146,29 +118,85 @@ artifacts {
     archives sourcesJar
 }
 
-bintray {
-    def localProperties = new Properties()
-    def localPropertiesFile = rootProject.file('local.properties')
-    if (localPropertiesFile.exists()) {
-        localProperties.load(localPropertiesFile.newDataInputStream())
-        user = localProperties.getProperty("bintray.user")
-        key = localProperties.getProperty("bintray.apikey")
-    }
+def siteUrl = 'https://github.com/libpd/pd-for-android'
 
-    if (user != null &&  key != null) {
-        logger.info('Bintray user/apikey found')
-    } else {
-        logger.info('Bintray user/apikey not found')
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId group
+            artifactId archivesBaseName
+            version version
+            // TODO: include aar artifact from components?
+            artifact "${buildDir}/outputs/aar/${archivesBaseName}.aar"
+            // ossrh requires javadoc and sources
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = "${project.group}:${project.archivesBaseName}"
+			    description = 'Pure Data for Android'
+                url = siteUrl
+                licenses {
+                    license {
+                        name = 'BSD New'
+                        url = 'https://raw.githubusercontent.com/libpd/pd-for-android/master/PdCore/LICENSE.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'joebowbeer'
+                        name = 'Joe Bowbeer'
+                    }
+                    // TODO: Add all other devs here...
+                }
+                scm {
+                    connection = 'scm:git:https://github.com/libpd/pd-for-android'
+                    developerConnection = 'scm:git:ssh://github.com/libpd/pd-for-android.git'
+                    url = siteUrl
+                }
+            }
+        }
     }
+}
 
-    configurations = ['archives']
-    pkg {
-        repo = "maven"
-        name = "pd-for-android"
-        userOrg = 'pd-for-android'
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = ["BSD New"]
-        publish = false
+// configure publishing to a local directory for testing (not necessary)
+// ./gradlew publishMavenPublicationToLocalRepository
+// tree ./PdCore/build/repos
+publishing {
+    repositories {
+		maven {
+			name = 'local'
+			def releasesRepoUrl = "$buildDir/repos/releases"
+			def snapshotsRepoUrl = "$buildDir/repos/snapshots"
+			url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+		}
     }
 }
+
+// ossrh requires signed releases, but not snapshots.
+// This configures signing if a key is found.
+// The following environment variables provide a signing key and passphrase:
+// export ORG_GRADLE_PROJECT_signingKey=`cat private.pgp`
+// export ORG_GRADLE_PROJECT_signingPassword="<passphrase>"
+// After making the above available, you can try signing using
+// ./gradlew signMavenPublication
+def hasSigningKey = project.hasProperty('signingKeyId') || project.hasProperty('signingKey')
+if (hasSigningKey) {
+	sign(project)
+}
+void sign(Project project) {
+	project.signing {
+		required { project.gradle.taskGraph.hasTask('required') }
+		def signingKeyId = project.findProperty('signingKeyId')
+		def signingKey = project.findProperty('signingKey')
+		def signingPassword = project.findProperty('signingPassword')
+		if (signingKeyId) {
+            // use in-memory ascii-armored OpenPGP subkey
+			useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+		} else if (signingKey) {
+            // use in-memory ascii-armored key
+			useInMemoryPgpKeys(signingKey, signingPassword)
+		}
+		sign publishing.publications.maven
+	}
+}

build.gradle

@@ -2,20 +2,39 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter() // @FIXME
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+    }
+}
+
+plugins {
+    // must be applied to root project
+    id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
+}
+
+// These are specific to PdCode, but nexusPublishing needs them here:
+// https://github.com/gradle-nexus/publish-plugin/issues/84
+group = 'io.github.libpd.android'
+version = '1.2.1-SNAPSHOT'
+
+// Create a Sonatype user token for these environment variables:
+// export ORG_GRADLE_PROJECT_sonatypeUsername="<tokenUsername>"
+// export ORG_GRADLE_PROJECT_sonatypePassword="<tokenPassword>"
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri('https://s01.oss.sonatype.org/service/local/'))
+            snapshotRepositoryUrl.set(uri('https://s01.oss.sonatype.org/content/repositories/snapshots/'))
+        }
     }
 }
 
 allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter() // @FIXME
+        jcenter() // FIXME: com.noisepages.nettoyeur:midi
     }
 }