Bump Gradle to 8.7-rc-1 (#5592)

* Bump Gradle to 8.6

* bump to 8.7-rc-1

* remove another instance of removeGradleApiFromApi

gradle/libraries.toml

@@ -113,7 +113,7 @@ http4k-bom = "org.http4k:http4k-bom:5.8.0.0"
 http4k-core = { module = "org.http4k:http4k-core" }
 http4k-server-undertow = { module = "org.http4k:http4k-server-undertow" }
 http4k-server-jetty = { module = "org.http4k:http4k-server-jetty" }
-intellij-plugin = "org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.16.0"
+intellij-plugin = "org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.17.0"
 intellij-changelog = "org.jetbrains.intellij.plugins:gradle-changelog-plugin:2.0.0"
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

libraries/apollo-gradle-plugin-external/build.gradle.kts

@@ -41,6 +41,13 @@ gradlePlugin {
   }
 }
 
-gr8 {
-  removeGradleApiFromApi()
+// The java-gradle-plugin adds `gradleApi()` to the `api` implementation but it contains some JDK15 bytecode at
+// org/gradle/internal/impldep/META-INF/versions/15/org/bouncycastle/jcajce/provider/asymmetric/edec/SignatureSpi$EdDSA.class:
+// java.lang.IllegalArgumentException: Unsupported class file major version 59
+// So remove it
+val apiDependencies = project.configurations.getByName("api").dependencies
+apiDependencies.firstOrNull {
+  it is SelfResolvingDependency
+}.let {
+  apiDependencies.remove(it)
 }

libraries/apollo-gradle-plugin/build.gradle.kts

@@ -73,7 +73,18 @@ if (relocateJar) {
       // Remove proguard rules from dependencies, we'll manage them ourselves
       exclude("META-INF/proguard/.*")
     }
-    removeGradleApiFromApi()
+
+    // The java-gradle-plugin adds `gradleApi()` to the `api` implementation but it contains some JDK15 bytecode at
+    // org/gradle/internal/impldep/META-INF/versions/15/org/bouncycastle/jcajce/provider/asymmetric/edec/SignatureSpi$EdDSA.class:
+    // java.lang.IllegalArgumentException: Unsupported class file major version 59
+    // So remove it
+    val apiDependencies = project.configurations.getByName("api").dependencies
+    apiDependencies.firstOrNull {
+      it is SelfResolvingDependency
+    }.let {
+      apiDependencies.remove(it)
+    }
+
 
     configurations.named("compileOnly").configure {
       extendsFrom(shadeConfiguration)