update gradle to 8.5, jdk to 17 and fix vscode launch

elki-project · Mar 26, 2024 · ec2216a · ec2216a
1 parent 89a376e
commit ec2216a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
+    - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
         distribution: temurin

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
+    - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
         distribution: temurin

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
+    - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
         distribution: temurin

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,22 +6,22 @@
             "name": "ELKI MiniGUI",
             "request": "launch",
             "mainClass": "elki.gui.minigui.MiniGUI",
-            "projectName": "elki-bundle"
+            "projectName": "bundle"
         },
         {
             "type": "java",
             "name": "ELKI MiniGUI Debug",
             "request": "launch",
             "mainClass": "elki.gui.minigui.MiniGUI",
-            "projectName": "elki-bundle",
+            "projectName": "bundle",
             "vmArgs": "-ea"
         },
         {
             "type": "java",
             "name": "ELKI Rerun last",
             "request": "launch",
             "mainClass": "elki.gui.minigui.MiniGUI",
-            "projectName": "elki-bundle",
+            "projectName": "bundle",
             "args": "-minigui.last -minigui.autorun",
             "vmArgs": "-ea"
         },
@@ -30,14 +30,14 @@
             "name": "ELKI check service files",
             "request": "launch",
             "mainClass": "elki.application.internal.CheckELKIServices",
-            "projectName": "elki-bundle"
+            "projectName": "bundle"
         },
         {
             "type": "java",
             "name": "ELKI check parameterizables",
             "request": "launch",
             "mainClass": "elki.application.internal.CheckParameterizables",
-            "projectName": "elki-bundle"
+            "projectName": "bundle"
         }
     ]
 }
diff --git a/addons/bundle/build.gradle b/addons/bundle/build.gradle
@@ -75,7 +75,7 @@ shadowJar {
   from jar.outputs.files // To include the bundle jar with above notices!
   //configurations = [ project.configurations.implementation ]
   destinationDirectory = project.parent.rootDir
-  classifier = null
+  archiveClassifier = null
   manifest {
     attributes("Class-Path" : "")
   }

diff --git a/build.gradle b/build.gradle
@@ -13,9 +13,15 @@ allprojects  {
   group = 'io.github.elki-project'
   version = '0.8.1-SNAPSHOT'
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+  java.sourceCompatibility = 1.8
+  java.targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
+  // compatiblity with gradle 9+
+  // not compatile with java 8
+  // tasks.withType(JavaCompile) {
+  //   options.release = 17
+  //   options.encoding = 'UTF-8'
+  // }
 
   ext.vendor = "ELKI Development Team"
   ext.url = "https://elki-project.github.io/"

diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -17,9 +17,9 @@ if(project.hasProperty('jacoco')) {
     executionData.setFrom(project.fileTree(".") { include("**/build/jacoco/test.exec") })
 
     reports {
-      html.enabled = true
-      xml.enabled = true
-      csv.enabled = false
+      html.required = true
+      xml.required = true
+      csv.required = false
       xml.destination = "${buildDir}/reports/jacoco/report.xml" as File
     }
   }

diff --git a/gradle/package.gradle b/gradle/package.gradle
@@ -52,13 +52,13 @@ subprojects {
   }
   // Build source jars:
   task sourceJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
   }
   artifacts.archives sourceJar
   // Build javadoc jars:
   task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc.destinationDir
   }
   artifacts.archives javadocJar

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists