e7237609e5bf5ef54a7bb6e86fe55e0ff5751f5e
.github/workflows/release.yml
| ... | ... | @@ -79,6 +79,12 @@ jobs: |
| 79 | 79 | distribution: 'temurin' # See 'Supported distributions' for available options |
| 80 | 80 | java-version: '8' |
| 81 | 81 | mvn-toolchain-id: 'JavaSE-1.8' |
| 82 | + - name: Install JDK 17 |
|
| 83 | + uses: actions/setup-java@v4 |
|
| 84 | + with: |
|
| 85 | + distribution: 'temurin' # See 'Supported distributions' for available options |
|
| 86 | + java-version: '17' |
|
| 87 | + mvn-toolchain-id: 'JavaSE-17' |
|
| 82 | 88 | - name: Install JDK 25 |
| 83 | 89 | uses: actions/setup-java@v4 |
| 84 | 90 | with: |
| ... | ... | @@ -108,6 +114,7 @@ jobs: |
| 108 | 114 | GOOGLE_MAPS_AUTHENTICATION_PARAMS: ${{ secrets.GOOGLE_MAPS_AUTHENTICATION_PARAMS }} |
| 109 | 115 | APP_PARAMETERS: "-Daws.region=eu-west-1" |
| 110 | 116 | JAVA8_HOME: ${{env.JAVA_HOME_8_X64}} |
| 117 | + JAVA17_HOME: ${{env.JAVA_HOME_17_X64}} |
|
| 111 | 118 | run: | |
| 112 | 119 | ./configuration/buildAndUpdateProduct.sh -x ${{ github.event.inputs.runner_cpus == '' && '4' || github.event.inputs.runner_cpus }} ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1 |
| 113 | 120 | - name: show disk stats |
configuration/buildAndUpdateProduct.sh
| ... | ... | @@ -235,7 +235,7 @@ fi |
| 235 | 235 | rm $START_DIR/build.log |
| 236 | 236 | |
| 237 | 237 | if [[ "$@" == "clean" ]]; then |
| 238 | - ./gradlew clean |
|
| 238 | + JAVA_HOME="${JAVA17_HOME}" ./gradlew clean |
|
| 239 | 239 | if [[ $? != 0 ]]; then |
| 240 | 240 | exit 100 |
| 241 | 241 | fi |
| ... | ... | @@ -693,11 +693,11 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then |
| 693 | 693 | # mobile_extra="-P -with-not-android-relevant -P with-mobile" |
| 694 | 694 | |
| 695 | 695 | echo "Building apps with Gradle..." |
| 696 | - ./gradlew build |
|
| 696 | + JAVA_HOME="${JAVA17_HOME}" ./gradlew build |
|
| 697 | 697 | if [[ ${PIPESTATUS[0]} != 0 ]]; then |
| 698 | 698 | exit 100 |
| 699 | 699 | fi |
| 700 | - ./gradlew assemble |
|
| 700 | + JAVA_HOME="${JAVA17_HOME}" ./gradlew assemble |
|
| 701 | 701 | if [[ ${PIPESTATUS[0]} != 0 ]]; then |
| 702 | 702 | exit 100 |
| 703 | 703 | fi |