Skip to content

Commit bafc6b6

Browse files
authored
Use Java 11 everywhere (#5836)
* Use Java 11 everywhere * debug
1 parent 4689821 commit bafc6b6

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

tool/kokoro/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
source ./tool/kokoro/setup.sh
44
setup
55

6-
curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
7-
(cd ..; tar fx java.tar.gz)
8-
export JAVA_HOME_OLD=$JAVA_HOME
9-
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home
10-
116
echo "kokoro build start"
127

138
./bin/plugin make --channel=dev

tool/kokoro/deploy.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
source ./tool/kokoro/setup.sh
44
setup
55

6-
curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
7-
(cd ..; tar fx java.tar.gz)
8-
export JAVA_HOME_OLD=$JAVA_HOME
9-
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home
10-
116
echo "kokoro build start"
127

138
./bin/plugin make --channel=dev

tool/kokoro/setup.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,14 @@ setup() {
1616
flutter doctor
1717
export FLUTTER_SDK=`pwd`/../flutter
1818

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

2228
export FLUTTER_KEYSTORE_ID=74840
2329
export FLUTTER_KEYSTORE_NAME=flutter-intellij-plugin-auth-token

tool/kokoro/test.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
source ./tool/kokoro/setup.sh
44
setup
55

6-
curl https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz > ../java.tar.gz
7-
(cd ..; tar fx java.tar.gz)
8-
export JAVA_HOME=`pwd`/../jdk-11.0.2.jdk/Contents/Home
9-
export PATH=$PATH:$JAVA_HOME/bin
10-
echo "JAVA_HOME=$JAVA_HOME"
11-
126
(cd testData/sample_tests; echo "pub get `pwd`"; pub get --no-precompile)
137

148
echo "kokoro test start"

0 commit comments

Comments
 (0)