Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle Update and some Maintenance #111

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
}
]
}
2 changes: 1 addition & 1 deletion addons/bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "")
}
Expand Down
10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
6 changes: 3 additions & 3 deletions gradle/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/package.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading