Skip to content

Use Java 11 everywhere #5836

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.

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

Merged
merged 2 commits into from
Oct 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions tool/kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
source ./tool/kokoro/setup.sh
setup

curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
(cd ..; tar fx java.tar.gz)
export JAVA_HOME_OLD=$JAVA_HOME
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home

echo "kokoro build start"

./bin/plugin make --channel=dev
Expand Down
5 changes: 0 additions & 5 deletions tool/kokoro/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
source ./tool/kokoro/setup.sh
setup

curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
(cd ..; tar fx java.tar.gz)
export JAVA_HOME_OLD=$JAVA_HOME
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home

echo "kokoro build start"

./bin/plugin make --channel=dev
Expand Down
8 changes: 7 additions & 1 deletion tool/kokoro/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ setup() {
flutter doctor
export FLUTTER_SDK=`pwd`/../flutter

java -version
export JAVA_HOME_OLD=$JAVA_HOME
curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
(cd ..; tar fx java.tar.gz)
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home
export PATH=$PATH:$JAVA_HOME/bin
export JAVA_OPTS=" -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
echo "JAVA_HOME=$JAVA_HOME"
java -version

export FLUTTER_KEYSTORE_ID=74840
export FLUTTER_KEYSTORE_NAME=flutter-intellij-plugin-auth-token
Expand Down
6 changes: 0 additions & 6 deletions tool/kokoro/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
source ./tool/kokoro/setup.sh
setup

curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
(cd ..; tar fx java.tar.gz)
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home
export PATH=$PATH:$JAVA_HOME/bin
echo "JAVA_HOME=$JAVA_HOME"

(cd testData/sample_tests; echo "pub get `pwd`"; pub get --no-precompile)

echo "kokoro test start"
Expand Down