diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 068e6c9..e6e7ffa 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -33,21 +33,20 @@ jobs: working-directory: examples/bld run: ./bld download - - name: Compile and run [bld examples] + - name: Compile and run examples [bld example] working-directory: examples/bld run: | - ./bld compile run + ./bld compile + ./bld run ./bld run-java - name: Run example [gradle java example] working-directory: examples/gradle/java - if: matrix.java-version != '24' run: | ./gradlew run - name: Run example [gradle kotlin example] working-directory: examples/gradle/kotlin - if: matrix.java-version != '24' run: | ./gradlew run diff --git a/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar index 9bbc975..1b33c55 100644 Binary files a/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties index 37f853b..ca025c8 100644 --- a/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/gradle/java/gradlew b/examples/gradle/java/gradlew index faf9300..23d15a9 100755 --- a/examples/gradle/java/gradlew +++ b/examples/gradle/java/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/examples/gradle/java/gradlew.bat b/examples/gradle/java/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/examples/gradle/java/gradlew.bat +++ b/examples/gradle/java/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar index 9bbc975..1b33c55 100644 Binary files a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties index 37f853b..ca025c8 100644 --- a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/gradle/kotlin/gradlew b/examples/gradle/kotlin/gradlew index faf9300..23d15a9 100755 --- a/examples/gradle/kotlin/gradlew +++ b/examples/gradle/kotlin/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/examples/gradle/kotlin/gradlew.bat b/examples/gradle/kotlin/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/examples/gradle/kotlin/gradlew.bat +++ b/examples/gradle/kotlin/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell