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.

Sign up for GitHub

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

Jump to bottom

Bump JavaFX plugin #376

Merged
merged 6 commits into from
Sep 15, 2023
Merged

Bump JavaFX plugin #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
383211f
Bump JavaFX plugin
jperedadnr Sep 12, 2023
a85d084
Use JDK17
jperedadnr Sep 12, 2023
5da8cbe
use latest JDK17
jperedadnr Sep 12, 2023
95e9bd2
Use latest setup-java action
jperedadnr Sep 12, 2023
b800309
Back to setup-java
jperedadnr Sep 12, 2023
087fe66
typo
jperedadnr Sep 12, 2023
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
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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)
}
}
abhinayagarwal marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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
View file
Open in desktop
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
Loading