diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f5bbd7..0488cb4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - jdk: [21, 23] + jdk: [23] os: [windows-latest, ubuntu-latest] fail-fast: false max-parallel: 4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index abdac80..9b35007 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: '23' - name: Create JPro distribution run: | ./gradlew clean jproRelease diff --git a/build.gradle b/build.gradle index 46f73b0..bb455c4 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ version = "$projectVersion" group = 'one.jpro' java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_22 + targetCompatibility = JavaVersion.VERSION_22 } repositories { @@ -32,4 +32,7 @@ application { jpro { // jpro server port port = 8080 + + // include all platforms in the release package + releasePlatforms = ["all"] } diff --git a/gradle.properties b/gradle.properties index 2e7de0f..96c2c28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ projectVersion = 1.0-SNAPSHOT -jproVersion = 2025.1.0 +jproVersion = 2025.2.0 javafxPluginVersion = 0.1.0 -javafxVersion = 23.0.2 +javafxVersion = 24 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d9fbee2..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line.