From 383211f4d635ef18294be066fd0b88d20b593b94 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 12 Sep 2023 13:49:56 +0200 Subject: [PATCH 1/6] Bump JavaFX plugin --- build.gradle | 3 ++- gradle/mavenPublish.gradle | 9 --------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 9df0279c..a41bb19c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import java.time.Duration plugins { id 'java-library' id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' - id "org.openjfx.javafxplugin" version "0.0.10" apply false + id "org.openjfx.javafxplugin" version "0.1.0" apply false } if (System.getProperty('os.name').toLowerCase().contains("mac")) { @@ -32,6 +32,7 @@ subprojects { } javafx { + version = "20.0.2" modules 'javafx.graphics' } } diff --git a/gradle/mavenPublish.gradle b/gradle/mavenPublish.gradle index 7064472f..6e326099 100644 --- a/gradle/mavenPublish.gradle +++ b/gradle/mavenPublish.gradle @@ -69,15 +69,6 @@ publishing { url = 'https://github.com/gluonhq/attach' } } - - pom.withXml { - Node pomNode = asNode() - pomNode.dependencies.'*'.findAll() { - it.groupId.text() == 'org.openjfx' - }.each { - it.parent().remove(it) - } - } } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684..db9a6b82 100644 --- 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index e527936e..9bc2af14 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,6 @@ pluginManagement { repositories { - maven { - url 'https://plugins.gradle.org/m2/' - } + gradlePluginPortal() mavenCentral() mavenLocal() } From a85d084adf0960dff93a4daf5b6a703301bedd2f Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 12 Sep 2023 15:34:11 +0200 Subject: [PATCH 2/6] Use JDK17 --- .github/workflows/build.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7efff3a4..82adc0ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,10 +19,11 @@ jobs: with: fetch-depth: 5 - - name: Setup Java 11 - uses: actions/setup-java@v1 + - name: Setup Java + uses: oracle-actions/setup-java@v1 with: - java-version: 11 + website: jdk.java.net + release: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a2610a42..ee2ee4b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,11 @@ jobs: fetch-depth: 5 persist-credentials: false - - name: Setup Java 11 - uses: actions/setup-java@v1 + - name: Setup Java + uses: oracle-actions/setup-java@v1 with: - java-version: 11 + website: jdk.java.net + release: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew From 5da8cbe7ee274cc558d093ed2eaa244cdeeb3c5f Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 12 Sep 2023 15:52:20 +0200 Subject: [PATCH 3/6] use latest JDK17 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82adc0ac..16ec0502 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: uses: oracle-actions/setup-java@v1 with: website: jdk.java.net - release: 17 + release: 17.0.8 - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee2ee4b9..a629900d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: uses: oracle-actions/setup-java@v1 with: website: jdk.java.net - release: 17 + release: 17.0.8 - name: Grant execute permission for gradlew run: chmod +x gradlew From 95e9bd21db6b1ce85ba92009355177b6dcbd878b Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 12 Sep 2023 15:55:40 +0200 Subject: [PATCH 4/6] Use latest setup-java action --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16ec0502..bc9c596b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,10 @@ jobs: fetch-depth: 5 - name: Setup Java - uses: oracle-actions/setup-java@v1 + uses: oracle-actions/setup-java@v1.3.1 with: website: jdk.java.net - release: 17.0.8 + release: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a629900d..8683420d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,10 @@ jobs: persist-credentials: false - name: Setup Java - uses: oracle-actions/setup-java@v1 + uses: oracle-actions/setup-java@v1.3.1 with: website: jdk.java.net - release: 17.0.8 + release: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew From b800309f10492f744697ca0b7bcf84fffe7f959d Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 12 Sep 2023 17:52:15 +0200 Subject: [PATCH 5/6] Back to setup-java --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc9c596b..9d3c1ba8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,10 @@ jobs: fetch-depth: 5 - name: Setup Java - uses: oracle-actions/setup-java@v1.3.1 + - uses: actions/setup-java@v3 with: - website: jdk.java.net - release: 17 + distribution: 'temurin' + java-version: '17' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8683420d..43ab6c30 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,10 @@ jobs: persist-credentials: false - name: Setup Java - uses: oracle-actions/setup-java@v1.3.1 + - uses: actions/setup-java@v3 with: - website: jdk.java.net - release: 17 + distribution: 'temurin' + java-version: '17' - name: Grant execute permission for gradlew run: chmod +x gradlew From 087fe6650e4f99c91aaecbf35b17d5e82c811bb5 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 12 Sep 2023 17:53:31 +0200 Subject: [PATCH 6/6] typo --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d3c1ba8..eb38caaf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 5 - name: Setup Java - - uses: actions/setup-java@v3 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43ab6c30..c4e9885e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: persist-credentials: false - name: Setup Java - - uses: actions/setup-java@v3 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '17'