From 3fe700e95fd9665473b8669bb5775bb75935eb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pereda?= <pereda@eii.uva.es>
Date: Fri, 15 Sep 2023 11:16:02 +0200
Subject: [PATCH] Bump JavaFX plugin (#376)

* Bump JavaFX plugin

* Use JDK17

* use latest JDK17

* Use latest setup-java action

* Back to setup-java

* typo
---
 .github/workflows/build.yml              | 7 ++++---
 .github/workflows/release.yml            | 7 ++++---
 build.gradle                             | 3 ++-
 gradle/mavenPublish.gradle               | 9 ---------
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 settings.gradle                          | 4 +---
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7efff3a4..eb38caaf 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: actions/setup-java@v3
         with:
-          java-version: 11
+          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 a2610a42..c4e9885e 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: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
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()
     }