@@ -98,10 +98,16 @@ jobs:
9898
9999 - name : Tell gradle to use JDK ${{ env.jdk_version }} (linux, Windows)
100100 if : ${{ !startsWith(matrix.os, 'macos') }}
101- run : sed -i "s/JavaLanguageVersion.of(24)/JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
101+ run : |
102+ sed -i "s/JavaLanguageVersion.of(24)/JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
103+ sed -i "s#vendor = JvmVendorSpec.AZUL##" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
104+ cat build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
102105 - name : Tell gradle to use JDK ${{ env.jdk_version }} (macOS)
103106 if : ${{ startsWith(matrix.os, 'macos') }}
104- run : sed -i '' "s/JavaLanguageVersion.of(24)/JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
107+ run : |
108+ sed -i '.bak' "s/JavaLanguageVersion.of(24)/JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
109+ sed -i '.bak' "s#vendor = JvmVendorSpec.AZUL##" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
110+ cat build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
105111
106112 # region setup-JDK
107113 - name : Setup JDK ${{ env.jdk_version }} (${{ env.jdk }}) for "java toolchain" of Gradle
@@ -190,7 +196,6 @@ jobs:
190196 for buildgradle in **/build.gradle.kts; do
191197 sed -i '/javafx {/{n;s#version = ".*"#sdk = "javafx/javafx-sdk-${{ env.javafx }}"#}' $buildgradle
192198 sed -i "s#jlink {#jlink { addExtraModulePath(\"javafx/javafx-jmods-${{ env.javafx }}\")#" $buildgradle
193- sed -i "s#vendor = JvmVendorSpec.AZUL##" $buildgradle
194199 cat $buildgradle
195200 done
196201 - name : ' Set JavaFX ${{ env.javafx }} (macOS)'
@@ -200,7 +205,6 @@ jobs:
200205 find . -name 'build.gradle.kts' | while read -r buildgradle; do
201206 sed -i '.bak' -e '/javafx {/{n' -e 's#version = ".*"#sdk = "javafx/javafx-sdk-${{ env.javafx }}"#;}' $buildgradle
202207 sed -i '.bak' -e "s#jlink {#jlink { addExtraModulePath(\"javafx/javafx-jmods-${{ env.javafx }}\")#" $buildgradle
203- sed -i '.bak' "s#vendor = JvmVendorSpec.AZUL##" $buildgradle
204208 cat $buildgradle
205209 done
206210 - name : ' Set JavaFX ${{ env.javafx }} (linux-arm)'
0 commit comments