upgrade to java 17

ArkEcosystem · Nov 20, 2024 · d21c0d2 · d21c0d2
1 parent 842045f
commit d21c0d2
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 62 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -7,23 +7,23 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                java: [8, 11, 15, 16, 17, 18, 19, 20, 21, 22]
+                java: [17, 18, 19, 20, 21]
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Use Java Version ${{ matrix.java }}
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v3
               with:
-                  distribution: "zulu"
+                  distribution: "temurin"
                   java-version: ${{ matrix.java }}
                   cache: "gradle"
 
-            - name: Install
-              run: gradle dependencies
+            - name: Install Dependencies
+              run: ./gradlew dependencies
 
-            - name: Test
-              run: gradle integrationTest
+            - name: Run Integration Tests
+              run: ./gradlew integrationTest
               env:
                   INTEGRATION_TESTS_MNEMONIC: ${{ secrets.MNEMONIC }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
 name: Publish package to the Maven Central Repository
+
 on:
     release:
         types: [created]
@@ -18,16 +19,16 @@ jobs:
             packages: write
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - name: Set up Java
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v3
               with:
-                  java-version: '8'
-                  distribution: 'adopt'
+                  java-version: "17"
+                  distribution: "temurin"
 
             - name: Publish to the Maven Central Repository
-              run: gradle publish
+              run: ./gradlew publish
               env:
                   ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SIGNING_KEY }}
                   ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGNING_PASSWORD }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,22 +14,19 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   ref: ${{ github.head_ref }}
 
-            - name: Merge Conflict finder
-              uses: olivernybroe/[email protected]
-
-            - name: Use Java Version 8
-              uses: actions/setup-java@v2
+            - name: Use Java 17
+              uses: actions/setup-java@v3
               with:
-                  distribution: "adopt"
-                  java-version: 8
+                  distribution: "temurin"
+                  java-version: "17"
                   cache: "gradle"
 
             - name: Format code
-              run: gradle format
+              run: ./gradlew formatCode
 
             - name: Commit fixed code
               uses: stefanzweifel/git-auto-commit-action@v4
@@ -41,30 +38,48 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                # test against the latest update of each major Java version, as well as specific updates of LTS versions:
-                java: [8, 11, 15, 16, 17, 18, 19, 20, 21, 22]
+                java: [17, 18, 19, 20, 21]
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   ref: ${{ github.head_ref }}
 
-            - name: Merge Conflict finder
-              uses: olivernybroe/[email protected]
-
             - name: Use Java Version ${{ matrix.java }}
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v3
               with:
-                  distribution: "zulu"
+                  distribution: "temurin"
                   java-version: ${{ matrix.java }}
                   cache: "gradle"
 
-            - name: Install
-              run: gradle dependencies
+            - name: Install Dependencies
+              run: ./gradlew dependencies
 
-            - name: Test
-              run: gradle test && gradle jacocoTestReport
+            - name: Run Tests
+              run: ./gradlew test jacocoTestReport
+
+            - name: Upload Test Results
+              uses: actions/upload-artifact@v3
+              with:
+                  name: test-results
+                  path: build/reports/tests/test
+
+            - name: Upload Coverage Report
+              uses: actions/upload-artifact@v3
+              with:
+                  name: code-coverage-report
+                  path: build/reports/jacoco/test/html
+
+            - name: Upload Jacoco XML Report
+              uses: actions/upload-artifact@v3
+              with:
+                  name: jacoco-xml-report
+                  path: build/reports/jacoco/test/jacocoTestReport.xml
 
             - name: Codecov
-              run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
+              uses: codecov/codecov-action@v3
+              with:
+                  token: ${{ secrets.CODECOV_TOKEN }}
+                  files: build/reports/jacoco/test/jacocoTestReport.xml
+                  fail_ci_if_error: true
diff --git a/build.gradle b/build.gradle
@@ -7,10 +7,7 @@ plugins {
 }
 
 group = 'org.arkecosystem'
-version = '2.0.0'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+version = '2.0.0-mainsail'
 
 repositories {
     mavenLocal()
@@ -30,9 +27,9 @@ configurations {
 }
 
 dependencies {
-    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.8.1'
-    implementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.9.0'
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
+    implementation 'com.squareup.okhttp3:okhttp:4.8.1'
+    implementation 'com.squareup.okhttp3:mockwebserver:4.9.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
@@ -41,14 +38,17 @@ dependencies {
     integrationImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
     integrationImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
     integrationImplementation 'org.hamcrest:hamcrest-library:2.2'
-    integrationImplementation 'org.arkecosystem:crypto:2.0.0'
+    integrationImplementation 'org.arkecosystem:crypto:2.0.0-mainsail'
     integrationCompileOnly 'org.slf4j:slf4j-api:1.7.32'
     integrationRuntimeOnly 'org.slf4j:slf4j-simple:1.7.32'
     integrationImplementation 'com.github.rholder:guava-retrying:2.0.0'
-    integrationImplementation  "cash.z.ecc.android:kotlin-bip39:1.0.2"
+    integrationImplementation 'cash.z.ecc.android:kotlin-bip39:1.0.2'
 }
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
     withJavadocJar()
     withSourcesJar()
 }
@@ -81,18 +81,6 @@ spotless {
 
 task formatCode(dependsOn: ['spotlessApply'])
 
-task fatJar(type: Jar) {
-    manifest.from jar.manifest
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    } {
-        exclude "META-INF/*.SF"
-        exclude "META-INF/*.DSA"
-        exclude "META-INF/*.RSA"
-    }
-    with jar
-}
-
 build.dependsOn 'spotlessApply'
 
 tasks.register('integrationTest', Test) {
@@ -114,11 +102,9 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            pom {
-                groupId = project.group
-                version = project.version
-                artifactId = 'client'
+            artifactId = 'client'
 
+            pom {
                 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'
@@ -181,8 +167,13 @@ publishing {
 }
 
 signing {
+    // Only sign when publishing to remote repository
+    required { gradle.taskGraph.hasTask("publish") && !gradle.taskGraph.hasTask("publishToMavenLocal") }
+
     def signingKey = findProperty("signingKey")
     def signingPassword = findProperty("signingPassword")
-    useInMemoryPgpKeys(signingKey as String, signingPassword as String)
-    sign publishing.publications.mavenJava
+    if (signingKey && signingPassword) {
+        useInMemoryPgpKeys(signingKey as String, signingPassword as String)
+        sign publishing.publications.mavenJava
+    }
 }