diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08d8905c3..54bfa939b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,8 +26,8 @@ jobs: - uses: actions/setup-java@v4 with: java-version: | - 17 11 + 17 distribution: 'zulu' cache: 'gradle' - name: Prepare build variables @@ -38,7 +38,7 @@ jobs: - name: Build env: ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }} - run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist + run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist - name: Build local slim container image for testing uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9bc44b30b..64f34f41f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,8 +20,8 @@ jobs: - uses: actions/setup-java@v4 with: java-version: | - 17 11 + 17 distribution: 'zulu' cache: 'gradle' - name: Prepare build variables @@ -32,7 +32,7 @@ jobs: - name: Build env: ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }} - run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist + run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist - name: Build slim container image uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d7d2c4d7..8eeedd679 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,8 +20,8 @@ jobs: - uses: actions/setup-java@v4 with: java-version: | - 17 11 + 17 distribution: 'zulu' cache: 'gradle' - name: Set up QEMU @@ -52,14 +52,14 @@ jobs: ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }} ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }} run: | - ./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository + ./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository - name: Publish apt packages to Google Artifact Registry env: ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }} ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }} run: | - ./gradlew --info publish + ./gradlew -PenableCrossCompilerPlugin=true --info publish - name: Tar Packer templates for upload to GCS # Note, Halyard expects packer.tar.gz but doesn't actually gunzip it. # Thus we must create a non-gzipped tar archive. diff --git a/Dockerfile.compile b/Dockerfile.compile index f98974504..e6acb7f50 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -5,4 +5,4 @@ RUN apk add --update \ LABEL maintainer="sig-platform@spinnaker.io" ENV GRADLE_USER_HOME /workspace/.gradle ENV GRADLE_OPTS -Xmx4g -CMD ./gradlew --no-daemon rosco-web:installDist -x test +CMD ./gradlew -PenableCrossCompilerPlugin=true --no-daemon rosco-web:installDist -x test diff --git a/gradle.properties b/gradle.properties index 7c40a689d..9a695bb51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ korkVersion=7.230.0 org.gradle.parallel=true spinnakerGradleVersion=8.32.1 -targetJava11=true +targetJava17=false # To enable a composite reference to a project, set the # project property `'Composite=true'`.