Upgrade to Platform 2.0

README.md

@@ -29,14 +29,30 @@ Build the android libraries for the local machine (only works on Mac)
 ```bash
 ./gradlew publishToMavenLocal
 ```
-Build the android libraries to publish to Maven Central
+Build the android libraries to publish to Maven Central:
+1) Verify release & deploy configuration
+```bash
+./gradlew jreleaserConfig
+```
+2) Ensure a clean deployment
+```bash
+./gradlew clean
+```
+3) Generate all needed code for SWIG and Protobuf
+```bash
+./gradlew generateSWIG && ./gradlew generateProto
+```
+4) Stage all artifacts to a local directory
 ```bash
 ./gradlew publish
 ```
-
+5) Deploy and release
+```bash
+./gradlew jreleaserDeploy
+```
 ### Use in other projects
 ```groovy
-dppVersion = "1.7.5"
+dppVersion = "2.0.0-SNAPSHOT"
 dependencies {
     implementation "org.dashj.platform:dash-sdk-java:$dppVersion"
     implementation "org.dashj.platform:dash-sdk-kotlin:$dppVersion" // dpp

build.gradle

@@ -1,16 +1,18 @@
 buildscript {
-    ext.version = '1.7.5'
+    ext.version = '2.0.0-SNAPSHOT'
     ext.kotlin_version = '1.8.22'
     ext.dashj_version = '21.1.7'
     repositories {
         google()  // Required for Android library and application projects
         mavenCentral()
+        gradlePluginPortal()  // Required for JReleaser plugin
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.2.2'  // Use the latest version
+        classpath 'com.android.tools.build:gradle:8.1.4'  // Use the latest version
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
+        classpath 'org.jreleaser:jreleaser-gradle-plugin:1.17.0'
     }
 }
 

dash-sdk-android/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
 }
+apply plugin: 'org.jreleaser'
 
 android {
     namespace "org.dashj.platform"
@@ -102,7 +103,7 @@ dependencies {
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier.set("sources")
 }
 
 assemble.dependsOn(publishToMavenLocal)
@@ -117,7 +118,7 @@ task javadoc(type: Javadoc) {
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set("javadoc")
     from javadoc.destinationDir
 }
 
@@ -130,12 +131,14 @@ assemble.dependsOn(publishToMavenLocal)
 assemble.dependsOn(sourcesJar)
 
 afterEvaluate {
+    def projectVersion = rootProject.ext.version
+
     publishing {
         publications {
             release(MavenPublication) {
                 groupId group
                 artifactId 'dash-sdk-android'
-                version project.rootProject.ext.version
+                version projectVersion
                 from components.release
 
                 pom {
@@ -166,13 +169,46 @@ afterEvaluate {
         }
         repositories {
             maven {
-                // change URLs to point to your repos, e.g. http://my.org/repo
-                def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
-                def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-                url = project.rootProject.ext.version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-                credentials {
-                    username = project.hasProperty('ossrhUsername') ? project.findProperty('ossrhUsername') : ''
-                    password = project.hasProperty('ossrhPassword') ? project.findProperty('ossrhPassword') : ''
+                url = layout.buildDirectory.dir('staging-deploy')
+            }
+        }
+    }
+    jreleaser {
+        project {
+            name = 'dash-sdk-android'
+            description = 'Dash-SDK-Android'
+            website = 'https://dashj.org'
+            authors = ['HashEngineering']
+            license = 'MIT'
+            gitRootSearch = true
+            version = projectVersion
+        }
+
+        signing {
+            active = 'ALWAYS'
+            armored = true
+        }
+
+        deploy {
+            maven {
+                mavenCentral {
+                    sonatype {
+                        active = 'ALWAYS'
+                        url = 'https://central.sonatype.com/api/v1/publisher'
+                        stagingRepository("$buildDir/staging-deploy")
+                    }
+                }
+                nexus2 {
+                    app {
+                        active = 'SNAPSHOT'
+                        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+                        snapshotUrl = 'https://central.sonatype.com/repository/maven-snapshots/'
+                        applyMavenCentralRules = false // must be false for aar
+                        snapshotSupported = true
+                        closeRepository = true
+                        releaseRepository = true
+                        stagingRepository("$buildDir/staging-deploy")
+                    }
                 }
             }
         }

dash-sdk-android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.dashj.platform.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>