Skip to content

Commit

Permalink
Bump JavaFX plugin (#376)
Browse files Browse the repository at this point in the history
* Bump JavaFX plugin

* Use JDK17

* use latest JDK17

* Use latest setup-java action

* Back to setup-java

* typo
  • Loading branch information
José Pereda authored Sep 15, 2023
1 parent 572a43b commit 3fe700e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 20 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down Expand Up @@ -32,6 +32,7 @@ subprojects {
}

javafx {
version = "20.0.2"
modules 'javafx.graphics'
}
}
Expand Down
9 changes: 0 additions & 9 deletions gradle/mavenPublish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
}
}
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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 1 addition & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
pluginManagement {
repositories {
maven {
url 'https://plugins.gradle.org/m2/'
}
gradlePluginPortal()
mavenCentral()
mavenLocal()
}
Expand Down

0 comments on commit 3fe700e

Please sign in to comment.