From 928c8dc9889601596ce2f9352d90873ccf0d2492 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 1 Jul 2023 20:53:54 -0700 Subject: [PATCH] Add an updated gradle plugin to compile on Java 17. (#5185) Related to #5003. This at least lets Glide compile on Java 17. I'm not sure if it has any down stream impact on users of Glide. --- .github/workflows/build.yml | 2 +- build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bce3efffa..28a05f8b23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - uses: gradle/gradle-build-action@v2 - name: Build and run unit tests with Gradle diff --git a/build.gradle b/build.gradle index 048c15c1e1..77064c167d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ buildscript { classpath libs.ksp.gradle classpath libs.coroutines.binarycompat.gradle classpath libs.dokka.gradle + classpath 'com.guardsquare:proguard-gradle:' + (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11) ? '7.3.2' : '7.1.0') } }