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

Scene Builder 23.0.1 #750

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Scene Builder 23.0.1 #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7947046
build: Update bundles-mac.yml (#735, #736)
jperedadnr Sep 30, 2024
b8cac7f
bump jdk and javafx versions
jperedadnr Oct 16, 2024
6f8fd75
increment version to 23.0.1-SNAPSHOT
jperedadnr Oct 16, 2024
f8c6342
update jobs with java release and java version
jperedadnr Oct 16, 2024
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
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ on:
pull_request:

env:
JAVA_VERSION: '23'
JAVA_RELEASE: '23'
JAVA_VERSION: '23.0.1'

jobs:
verify:
Expand All @@ -20,7 +21,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ env.JAVA_VERSION }}
release: ${{ env.JAVA_RELEASE }}
version: ${{ env.JAVA_VERSION }}

- name: Run Tests (Linux)
if: runner.os == 'Linux'
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/bundles-kit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ on:
project-version:
required: true
type: string
java-version:
java-release:
default: '23'
required: false
type: string
java-version:
default: '23.0.1'
required: false
type: string

jobs:
build:
Expand All @@ -21,7 +25,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ inputs.java-version }}
release: ${{ inputs.java-release }}
version: ${{ inputs.java-version }}

- name: Cache Maven packages
uses: actions/cache@v4
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ on:
project-version:
required: true
type: string
java-version:
java-release:
default: '23'
required: false
type: string
java-version:
default: '23.0.1'
required: false
type: string
javafx-version:
default: '23'
default: '23.0.1'
required: false
type: string
test:
Expand All @@ -35,7 +39,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ inputs.java-version }}
release: ${{ inputs.java-release }}
version: ${{ inputs.java-version }}

- name: Setup JavaFX
id: javafx
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/bundles-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ on:
project-version:
required: true
type: string
java-version:
java-release:
default: '23'
required: false
type: string
java-version:
default: '23.0.1'
required: false
type: string
javafx-version:
default: '23'
default: '23.0.1'
required: false
type: string
test:
Expand All @@ -36,15 +40,16 @@ on:
required: true
jobs:
build:
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v4

- name: Setup Java
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ inputs.java-version }}
release: ${{ inputs.java-release }}
version: ${{ inputs.java-version }}

- uses: Apple-Actions/import-codesign-certs@v1
with:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-mac_aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ on:
project-version:
required: true
type: string
java-version:
java-release:
default: '23'
required: false
type: string
java-version:
default: '23.0.1'
required: false
type: string
javafx-version:
default: '23'
default: '23.0.1'
required: false
type: string
test:
Expand Down Expand Up @@ -45,7 +49,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ inputs.java-version }}
release: ${{ inputs.java-release }}
version: ${{ inputs.java-version }}

- uses: Apple-Actions/import-codesign-certs@v1
with:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ on:
project-version:
required: true
type: string
java-version:
java-release:
default: '23'
required: false
type: string
java-version:
default: '23.0.1'
required: false
type: string
javafx-version:
default: '23'
default: '23.0.1'
required: false
type: string
test:
Expand All @@ -39,7 +43,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ inputs.java-version }}
release: ${{ inputs.java-release }}
version: ${{ inputs.java-version }}

- name: Setup JavaFX
id: javafx
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/early-access.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ on:
branches: [ master ]

env:
JAVAFX_VERSION: '23'
JAVA_VERSION: '23'
JAVA_RELEASE: '23'
JAVA_VERSION: '23.0.1'
JAVAFX_VERSION: '23.0.1'

jobs:
precheck:
runs-on: ubuntu-20.04
if: startsWith(github.event.head_commit.message, 'Releasing version') != true
outputs:
JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
JAVA_RELEASE: ${{ env.JAVA_RELEASE }}
JAVA_VERSION: ${{ env.JAVA_VERSION }}
JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
APP_VERSION: ${{ steps.vars.outputs.APP_VERSION }}
PROJECT_VERSION: ${{ steps.vars.outputs.PROJECT_VERSION }}
steps:
Expand All @@ -25,7 +27,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ env.JAVA_VERSION }}
release: ${{ env.JAVA_RELEASE }}
version: ${{ env.JAVA_VERSION }}

- name: Cache Maven packages
uses: actions/cache@v4
Expand Down Expand Up @@ -129,7 +132,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ needs.precheck.outputs.JAVA_VERSION }}
release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
version: ${{ needs.precheck.outputs.JAVA_VERSION }}

- name: Cache Maven packages
uses: actions/cache@v4
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ on:
- GA

env:
JAVAFX_VERSION: '23'
JAVA_VERSION: '23'
JAVA_RELEASE: '23'
JAVA_VERSION: '23.0.1'
JAVAFX_VERSION: '23.0.1'

jobs:
precheck:
runs-on: ubuntu-20.04
outputs:
JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
JAVA_RELEASE: ${{ env.JAVA_RELEASE }}
JAVA_VERSION: ${{ env.JAVA_VERSION }}
JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
APP_VERSION: ${{ steps.vars.outputs.APP_VERSION }}
PROJECT_VERSION: ${{ steps.vars.outputs.PROJECT_VERSION }}
S3_PATH: ${{ steps.vars.outputs.S3_PATH }}
Expand All @@ -31,7 +33,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ env.JAVA_VERSION }}
release: ${{ env.JAVA_RELEASE }}
version: ${{ env.JAVA_VERSION }}

- name: Cache Maven packages
uses: actions/cache@v4
Expand Down Expand Up @@ -136,7 +139,8 @@ jobs:
uses: oracle-actions/[email protected]
with:
website: jdk.java.net
release: ${{ needs.precheck.outputs.JAVA_VERSION }}
release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
version: ${{ needs.precheck.outputs.JAVA_VERSION }}

- name: Cache Maven packages
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gluonhq.scenebuilder</groupId>
<artifactId>parent</artifactId>
<version>23.0.0-SNAPSHOT</version>
<version>23.0.1-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion kit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.gluonhq.scenebuilder</groupId>
<artifactId>parent</artifactId>
<version>23.0.0-SNAPSHOT</version>
<version>23.0.1-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.gluonhq.scenebuilder</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>23.0.0-SNAPSHOT</version>
<version>23.0.1-SNAPSHOT</version>
<name>Scene Builder</name>
<description>Scene Builder is a visual, drag n drop, layout tool for designing JavaFX application user interfaces</description>
<inceptionYear>2012</inceptionYear>
Expand All @@ -20,7 +20,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<javafx.version>23</javafx.version>
<javafx.version>23.0.1</javafx.version>
<aether.version>1.1.0</aether.version>
<charm.glisten.version>6.2.2</charm.glisten.version>
<gluon.attach.version>4.0.19</gluon.attach.version>
Expand Down