Merge pull request #23 from shima004/master

feat: Upgrade to Java 21 and Gradle 9.3.1

Author: gnardin

README.md

@@ -4,9 +4,9 @@
 
 ## 1. Software Pre-Requisites
 
-* Git
-* OpenJDK Java 17
-* Gradle
+- Git
+- OpenJDK Java 21
+- Gradle
 
 ## 2. Download
 
@@ -28,4 +28,4 @@ $ ./gradlew build
 
 ## 4. Support
 
-To report a bug, suggest improvements or request support, please open an issue at GitHub <https://github.com/roborescue/adf-core-java/issues>.
+To report a bug, suggest improvements or request support, please open an issue at GitHub <https://github.com/roborescue/adf-core-java/issues>.

build.gradle

@@ -7,9 +7,11 @@ defaultTasks 'build'
 
 group = 'com.github.roborescue'
 
-sourceCompatibility = '17'
-targetCompatibility = '17'
-version = '4.0'
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+version = '5.0'
 
 def getDateTime() {
   new Date().format('yyyyMMddHHmmss', TimeZone.getTimeZone('UTC'))
@@ -42,7 +44,7 @@ repositories {
     url = 'https://repo.enonic.com/public/'
   }
   maven {
-    url 'https://jitpack.io'
+    url = 'https://jitpack.io'
   }
 }
 
@@ -69,7 +71,7 @@ publishing {
   publications {
     maven(MavenPublication) {
       groupId = 'com.github.roborescue'
-      artifactId = 'adf-core'
+      artifactId = 'adf-core-java'
       version = 'master-SNAPSHOT'
 
       from components.java
@@ -90,21 +92,19 @@ clean{
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier = 'javadoc'
   from javadoc.destinationDir
   archiveFileName = 'adf-core-javadoc.jar'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-  classifier = 'sources'
+  archiveClassifier = 'sources'
   from sourceSets.main.allSource
   archiveFileName = 'adf-core-sources.jar'
 }
 
-artifacts {
-  archives sourcesJar
-  archives javadocJar
-}
+assemble.dependsOn sourcesJar
+assemble.dependsOn javadocJar
 
 task start (type: JavaExec) {
   classpath = sourceSets.main.runtimeClasspath
@@ -113,4 +113,4 @@ task start (type: JavaExec) {
     args project.args.split('\\s+')
   }
   jvmArgs '-Xms512m', '-Xmx8g'
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,5 +1,4 @@
-before_install:
-  - source "$HOME/.sdkman/bin/sdkman-init.sh"
-  - sdk update
-  - sdk install java 17.0.1-tem
-  - sdk use java 17.0.1-tem
+jdk:
+  - openjdk21
+install:
+  - ./gradlew publishToMavenLocal -Dmaven.repo.local=$HOME/.m2/repository

src/main/java/adf/core/launcher/ConsoleOutput.java

@@ -1,13 +1,15 @@
 package adf.core.launcher;
 
 import static adf.core.Main.VERSION_CODE;
-import adf.core.Main;
+
 import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
 import java.util.concurrent.Semaphore;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
+import adf.core.Main;
+
 public class ConsoleOutput {
 
   private static final int titleLength = 6;
@@ -112,12 +114,12 @@ private static String getTimestamp() {
     String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1)
         + "/META-INF/MANIFEST.MF";
     try {
-      Manifest manifest = new Manifest(new URL(manifestPath).openStream());
+      Manifest manifest = new Manifest(URI.create(manifestPath).toURL().openStream());
       Attributes attributes = manifest.getMainAttributes();
       buildTimestamp = attributes.getValue("Build-Timestamp");
     } catch (IOException e) {
     }
 
     return buildTimestamp;
   }
-}
+}