release: 1.2.8 (#98)

* style: spotless * chore: moving back to maven packages, adjusting automation * chore: additional rules in build.gradle
ArkEcosystem · Mar 20, 2020 · 2259c69 · 2259c69
1 parent 446cd5e
commit 2259c69
Show file tree

Hide file tree

Showing 17 changed files with 162 additions and 149 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,8 @@
 plugins {
     id 'java'
+    id 'maven'
     id 'maven-publish'
+    id 'signing'
     id 'jacoco'
     id 'com.diffplug.gradle.spotless' version '3.27.2'
 }
@@ -10,35 +12,6 @@ repositories {
     mavenCentral()
 }
 
-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)
-            }
-        }
-    }
-
-    javadoc {
-        if (JavaVersion.current().isJava9Compatible()) {
-            options.addBooleanOption('html5', true)
-        }
-    }
-}
-
 dependencies {
     compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.4.1'
     compile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.4.1'
@@ -48,6 +21,96 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }
 
+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.2.8'
+                artifactId = 'client'
+
+                name = 'java-client'
+                description = 'A Simple REST API Client Implementation in Java for the ARK CORE Blockchain Framework.'
+                url = 'https://sdk.ark.dev/java/client'
+                inceptionYear = '2018'
+
+                licenses {
+                    license {
+                        name = 'MIT'
+                        distribution = 'repo'
+                    }
+                }
+
+                developers {
+                    developer {
+                        name = 'Kovač Žan'
+                        email = '[email protected]'
+                        organization = 'ARK Ecosystem'
+                        organizationUrl = 'https://ark.io'
+                    }
+                    developer {
+                        name = 'Kristjan Košič'
+                        email = '[email protected]'
+                        organization = 'ARK Ecosystem'
+                        organizationUrl = 'https://ark.io'
+                    }
+                    developer {
+                        name = 'Brian Faust'
+                        email = '[email protected]'
+                        organization = 'ARK Ecosystem'
+                        organizationUrl = 'https://ark.io'
+                    }
+                    developer {
+                        name = 'Joshua Noack'
+                        email = '[email protected]'
+                        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.2.8'
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("signing.keyId")) {
+    apply plugin: 'signing'
+    signing {
+        sign configurations.archives
+    }
+}
+
 test {
     useJUnitPlatform()
     failFast = true
@@ -63,19 +126,15 @@ jacocoTestReport {
     }
 }
 
-wrapper {
-    gradleVersion = '6.2.0'
-}
-
 spotless {
     java {
         target fileTree(projectDir) {
             include 'src/main/**/*.java'
+            include 'src/test/**/*.java'
             exclude '**/build/**'
         }
         googleJavaFormat('1.1').aosp()
         removeUnusedImports()
-
     }
 }
 
@@ -94,14 +153,8 @@ task fatJar(type: Jar) {
     with jar
 }
 
-task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
-}
+build.dependsOn 'spotlessApply'
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
+wrapper {
+    gradleVersion = '6.2.0'
 }
-
-build.dependsOn 'spotlessApply'
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'java-client'
+rootProject.name = 'client'
 
diff --git a/src/test/java/org/arkecosystem/client/ConnectionManagerTest.java b/src/test/java/org/arkecosystem/client/ConnectionManagerTest.java
@@ -1,13 +1,12 @@
 package org.arkecosystem.client;
 
-import org.arkecosystem.client.api.Api;
-import org.junit.jupiter.api.Test;
-
-import java.util.HashMap;
-
 import static junit.framework.TestCase.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.HashMap;
+import org.arkecosystem.client.api.Api;
+import org.junit.jupiter.api.Test;
+
 public class ConnectionManagerTest {
     @Test
     public void connect() {

diff --git a/src/test/java/org/arkecosystem/client/MockHelper.java b/src/test/java/org/arkecosystem/client/MockHelper.java
@@ -1,10 +1,9 @@
 package org.arkecosystem.client;
 
+import java.util.HashMap;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 
-import java.util.HashMap;
-
 public class MockHelper {
     public static Connection connection() {
         MockWebServer mockServer = new MockWebServer();

diff --git a/src/test/java/org/arkecosystem/client/api/BlockchainTest.java b/src/test/java/org/arkecosystem/client/api/BlockchainTest.java
@@ -1,14 +1,13 @@
 package org.arkecosystem.client.api;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.gson.internal.LinkedTreeMap;
+import java.io.IOException;
 import org.arkecosystem.client.Connection;
 import org.arkecosystem.client.MockHelper;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class BlockchainTest {
 
     @Test

diff --git a/src/test/java/org/arkecosystem/client/api/BlocksTest.java b/src/test/java/org/arkecosystem/client/api/BlocksTest.java
@@ -1,15 +1,14 @@
 package org.arkecosystem.client.api;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.gson.internal.LinkedTreeMap;
+import java.io.IOException;
+import java.util.HashMap;
 import org.arkecosystem.client.Connection;
 import org.arkecosystem.client.MockHelper;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.util.HashMap;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class BlocksTest {
 
     @Test
@@ -53,5 +52,4 @@ void search() throws IOException {
         LinkedTreeMap<String, Object> actual = connection.api().blocks.search(new HashMap<>());
         assertTrue((boolean) actual.get("success"));
     }
-
 }
diff --git a/src/test/java/org/arkecosystem/client/api/BridgechainsTest.java b/src/test/java/org/arkecosystem/client/api/BridgechainsTest.java
@@ -1,15 +1,14 @@
 package org.arkecosystem.client.api;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.gson.internal.LinkedTreeMap;
+import java.io.IOException;
+import java.util.HashMap;
 import org.arkecosystem.client.Connection;
 import org.arkecosystem.client.MockHelper;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.util.HashMap;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class BridgechainsTest {
 
     @Test
@@ -22,7 +21,8 @@ void all() throws IOException {
     @Test
     void search() throws IOException {
         Connection connection = MockHelper.connection();
-        LinkedTreeMap<String, Object> actual = connection.api().bridgechains.search(new HashMap<>());
+        LinkedTreeMap<String, Object> actual =
+                connection.api().bridgechains.search(new HashMap<>());
         assertTrue((boolean) actual.get("success"));
     }
 }
diff --git a/src/test/java/org/arkecosystem/client/api/BusinessesTest.java b/src/test/java/org/arkecosystem/client/api/BusinessesTest.java
@@ -1,15 +1,14 @@
 package org.arkecosystem.client.api;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.gson.internal.LinkedTreeMap;
+import java.io.IOException;
+import java.util.HashMap;
 import org.arkecosystem.client.Connection;
 import org.arkecosystem.client.MockHelper;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.util.HashMap;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class BusinessesTest {
 
     @Test
@@ -29,14 +28,16 @@ void show() throws IOException {
     @Test
     void showBridgechains() throws IOException {
         Connection connection = MockHelper.connection();
-        LinkedTreeMap<String, Object> actual = connection.api().businesses.showBridgechains("dummy");
+        LinkedTreeMap<String, Object> actual =
+                connection.api().businesses.showBridgechains("dummy");
         assertTrue((boolean) actual.get("success"));
     }
 
     @Test
     void showBridgechain() throws IOException {
         Connection connection = MockHelper.connection();
-        LinkedTreeMap<String, Object> actual = connection.api().businesses.showBridgechain("dummy", "dummy");
+        LinkedTreeMap<String, Object> actual =
+                connection.api().businesses.showBridgechain("dummy", "dummy");
         assertTrue((boolean) actual.get("success"));
     }
 
@@ -46,5 +47,4 @@ void search() throws IOException {
         LinkedTreeMap<String, Object> actual = connection.api().businesses.search(new HashMap<>());
         assertTrue((boolean) actual.get("success"));
     }
-
 }
diff --git a/src/test/java/org/arkecosystem/client/api/DelegatesTest.java b/src/test/java/org/arkecosystem/client/api/DelegatesTest.java
@@ -1,15 +1,14 @@
 package org.arkecosystem.client.api;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.google.gson.internal.LinkedTreeMap;
+import java.io.IOException;
+import java.util.HashMap;
 import org.arkecosystem.client.Connection;
 import org.arkecosystem.client.MockHelper;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.util.HashMap;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class DelegatesTest {
 
     @Test
@@ -46,5 +45,4 @@ void search() throws IOException {
         LinkedTreeMap<String, Object> actual = connection.api().delegates.search(new HashMap<>());
         assertTrue((boolean) actual.get("success"));
     }
-
 }