From f50cbe37321ffbdc62842ddf19970d85f6849ba2 Mon Sep 17 00:00:00 2001 From: Aosen Xiong <82676488+Ao-senXiong@users.noreply.github.com> Date: Tue, 12 Sep 2023 21:04:14 -0400 Subject: [PATCH] Remove hack now that JSpecify uses newer gradle (#567) --- checker/bin-devel/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/checker/bin-devel/build.sh b/checker/bin-devel/build.sh index 363b0305e58..cb7a98bc00f 100755 --- a/checker/bin-devel/build.sh +++ b/checker/bin-devel/build.sh @@ -84,8 +84,6 @@ if [[ "$version" -ge 9 ]]; then echo "Running: (cd ../jspecify/ && ./gradlew assemble)" # If failure, retry in case the failure was due to network lossage. (cd ../jspecify/ && \ - # Temporarily, until a gradle 8.1 release is used, to allow JDK 20 tests to pass. - sed -i "s/gradle-8.0-bin/gradle-8.1-rc-1-bin/" gradle/wrapper/gradle-wrapper.properties && \ export JDK_JAVA_OPTIONS='--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED' && \ (./gradlew assemble || (sleep 60 && ./gradlew assemble))) echo "... done: (cd ../jspecify/ && ./gradlew assemble)"