release: 1.0.1 (#89)

* chore: fixed root project name

* chore: clean build.gradle, prepare for github packages, adjust to latest format

* style: back to aosp 1.1 format rules

* fix: parameter passing

* chore: github action to test against multiple java-versions

* chore: github action for publish package when tag  release

Author: Kristjan Kosic

.github/workflows/publish-release.yml

@@ -0,0 +1,27 @@
+name: Publish Release
+
+on:
+    release:
+        types: [published]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Set up JDK 11
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 11
+
+            - name: Build with Gradle
+              run: gradle build
+
+            - name: Publish to GitHub Packages
+              run: gradle publish
+              env:
+                  USERNAME: ${{ github.actor }}
+                  PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/test.yml

@@ -1,23 +1,27 @@
 name: Test
 
 on:
-  push:
-    branches:
-      - "master"
-      - "develop"
-  pull_request:
-    types: [ready_for_review, synchronize, opened]
+    push:
+        branches:
+            - "master"
+            - "develop"
+    pull_request:
+        types: [ready_for_review, synchronize, opened]
 
 jobs:
     unit:
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                # test against latest update of each major Java version, as well as specific updates of LTS versions:
+                java: [ 8, 9, 10, 11, 12, 13 ]
 
         steps:
             - uses: actions/checkout@v1
-            - name: Set up JDK 1.8
+            - name: Use Java Version ${{ matrix.java }}
               uses: actions/setup-java@v1
               with:
-                  java-version: 1.8
+                  java-version: ${{ matrix.java }}
             - name: Install
               run: gradle dependencies
             - name: Test

build.gradle

@@ -1,128 +1,41 @@
-buildscript {
-    dependencies {
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.27.1"
-    }
-}
-
 plugins {
     id 'java'
-    id 'maven'
     id 'maven-publish'
-    id 'signing'
     id 'jacoco'
+    id 'com.diffplug.gradle.spotless' version '3.27.1'
 }
 
-apply plugin:'java'
-apply plugin:'maven'
-apply plugin:'maven-publish'
-apply plugin: com.diffplug.gradle.spotless.SpotlessPlugin
-
 repositories {
     jcenter()
     mavenCentral()
 }
 
-task fatJar(type: Jar) {
-    manifest.from jar.manifest
-    classifier = 'standalone'
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    } {
-        exclude "META-INF/*.SF"
-        exclude "META-INF/*.DSA"
-        exclude "META-INF/*.RSA"
-    }
-    with jar
-}
-
-task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    archives javadocJar, sourcesJar
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "file://${buildDir}/repo") {}
-
-            //repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
-             // authentication(userName: '', password: '')
-           // }
-
-          //  snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-          //      authentication(userName: ossrhUsername, password: ossrhPassword)
-          //  }
-
-            pom.project {
-                groupId = 'org.arkecosystem'
-                version = '1.0.0'
-                artifactId = 'client'
-
-                name = 'java-client'
-                description = 'A simple Java API client for the ARK Blockchain.'
-                url = 'https://github.com/ArkEcosystem/java-client'
-                inceptionYear = '2018'
-
-                licenses {
-                    license {
-                        name = 'MIT'
-                        distribution = 'repo'
-                    }
-                }
-
-                developers {
-                    developer {
-                        name = 'Brian Faust'
-                        email = 'brian@ark.io'
-                        organization = 'Ark Ecosystem'
-                        organizationUrl = 'https://ark.io'
-                    }
-                    developer {
-                        name = 'Joshua Noack'
-                        email = 'joshua@ark.io'
-                        organization = 'Ark Ecosystem'
-                        organizationUrl = 'https://ark.io'
-                    }
-                    developer {
-                        name = 'Kristjan Kosic'
-                        email = 'kristjan@ark.io'
-                        organization = 'Ark Ecosystem'
-                        organizationUrl = 'https://ark.io'
-                    }
-                    developer {
-                        name = 'Zan Kovac'
-                        email = 'zan@ark.io'
-                        organization = 'Ark Ecosystem'
-                        organizationUrl = 'https://ark.io'
-                    }
-                }
-
-                scm {
-                    connection = 'scm:git:git://github.com/ArkEcosystem/java-client.git'
-                    developerConnection = 'scm:git:ssh://github.com:ArkEcosystem/java-client.git'
-                    url = 'https://github.com/ArkEcosystem/java-client/tree/1.0.0'
+group = 'org.arkecosystem'
+version = '1.0.1'
+
+publishing {
+    publishing {
+        repositories {
+            maven {
+                name = "github"
+                url = uri("https://maven.pkg.github.com/arkecosystem/java-client")
+                credentials {
+                    username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                    password = project.findProperty("gpr.key") ?: System.getenv("PASSWORD")
                 }
             }
         }
+        publications {
+            gpr(MavenPublication) {
+                from(components.java)
+            }
+        }
     }
-}
-
-if (project.hasProperty("signing.keyId")) {
-    apply plugin:'signing'
 
-    signing {
-        sign configurations.archives
+    javadoc {
+        if (JavaVersion.current().isJava9Compatible()) {
+            options.addBooleanOption('html5', true)
+        }
     }
 }
 
@@ -151,7 +64,7 @@ jacocoTestReport {
 }
 
 wrapper {
-    gradleVersion = '5.6.2'
+    gradleVersion = '6.2.0'
 }
 
 spotless {
@@ -160,12 +73,35 @@ spotless {
             include 'src/main/**/*.java'
             exclude '**/build/**'
         }
-        googleJavaFormat()
+        googleJavaFormat('1.1').aosp()
         removeUnusedImports()
 
     }
 }
 
 task formatCode(dependsOn: ['spotlessApply'])
 
+task fatJar(type: Jar) {
+    manifest.from jar.manifest
+    classifier = 'standalone'
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    } {
+        exclude "META-INF/*.SF"
+        exclude "META-INF/*.DSA"
+        exclude "META-INF/*.RSA"
+    }
+    with jar
+}
+
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
 build.dependsOn 'spotlessApply'

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'arkecosystem-client'
+rootProject.name = 'java-client'
 

src/main/java/org/arkecosystem/client/Connection.java

@@ -5,15 +5,15 @@
 import org.arkecosystem.client.http.Client;
 
 public class Connection {
-  private Api api;
-  private Client client;
+    private Api api;
+    private Client client;
 
-  public Connection(Map<String, Object> config) {
-    this.client = new Client(config.get("host").toString());
-    this.api = new Api(this.client);
-  }
+    public Connection(Map<String, Object> config) {
+        this.client = new Client(config.get("host").toString());
+        this.api = new Api(this.client);
+    }
 
-  public Api api() {
-    return this.api;
-  }
+    public Api api() {
+        return this.api;
+    }
 }

src/main/java/org/arkecosystem/client/ConnectionManager.java

@@ -4,64 +4,64 @@
 import java.util.Map;
 
 public class ConnectionManager {
-  private Map<String, Connection> connections;
-  private String defaultConnection = "main";
+    private Map<String, Connection> connections;
+    private String defaultConnection = "main";
 
-  public ConnectionManager() {
-    this.connections = new HashMap<>();
-  }
-
-  public String getDefaultConnection() {
-    return this.defaultConnection;
-  }
-
-  public void setDefaultConnection(String name) {
-    this.defaultConnection = name;
-  }
+    public ConnectionManager() {
+        this.connections = new HashMap<>();
+    }
 
-  public Map<String, Connection> getConnections() {
-    return this.connections;
-  }
+    public String getDefaultConnection() {
+        return this.defaultConnection;
+    }
 
-  public Connection connect(Map config, String name) {
-    if (this.connections.containsKey(name)) {
-      throw new IllegalArgumentException("Connection [" + name + "] is already configured.");
+    public void setDefaultConnection(String name) {
+        this.defaultConnection = name;
     }
 
-    this.connections.put(name, new Connection(config));
+    public Map<String, Connection> getConnections() {
+        return this.connections;
+    }
 
-    return this.connections.get(name);
-  }
+    public Connection connect(Map config, String name) {
+        if (this.connections.containsKey(name)) {
+            throw new IllegalArgumentException("Connection [" + name + "] is already configured.");
+        }
 
-  public Connection connect(Map config) {
-    return connect(config, "main");
-  }
+        this.connections.put(name, new Connection(config));
 
-  public void disconnect(String name) {
-    if (name == null || name.isEmpty()) {
-      name = getDefaultConnection();
+        return this.connections.get(name);
     }
 
-    this.connections.remove(name);
-  }
+    public Connection connect(Map config) {
+        return connect(config, "main");
+    }
 
-  public void disconnect() {
-    disconnect(null);
-  }
+    public void disconnect(String name) {
+        if (name == null || name.isEmpty()) {
+            name = getDefaultConnection();
+        }
 
-  public Connection connection(String name) {
-    if (name == null || name.isEmpty()) {
-      name = getDefaultConnection();
+        this.connections.remove(name);
     }
 
-    if (!this.connections.containsKey(name)) {
-      throw new IllegalArgumentException("Connection [" + name + "] not configured.");
+    public void disconnect() {
+        disconnect(null);
     }
 
-    return this.connections.get(name);
-  }
+    public Connection connection(String name) {
+        if (name == null || name.isEmpty()) {
+            name = getDefaultConnection();
+        }
+
+        if (!this.connections.containsKey(name)) {
+            throw new IllegalArgumentException("Connection [" + name + "] not configured.");
+        }
 
-  public Connection connection() {
-    return connection(null);
-  }
+        return this.connections.get(name);
+    }
+
+    public Connection connection() {
+        return connection(null);
+    }
 }