From 6ea39fd12250e40e8b69da9dfea3d6599ea3fa27 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 12 Jan 2021 10:42:07 +0100 Subject: [PATCH] Upgrade to Gradle 6.8 Closes gh-26368 --- gradle/ide.gradle | 8 -------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gradle/ide.gradle b/gradle/ide.gradle index 9b3e13caaf1..48dea87a9b3 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -55,14 +55,6 @@ eclipse.classpath.file.whenMerged { classpath -> } } -// Ensure that test fixture dependencies are handled properly in Gradle 6.7. -// Bug fixed in Gradle 6.8: https://github.com/gradle/gradle/issues/14932 -eclipse.classpath.file.whenMerged { - entries.findAll { it instanceof ProjectDependency }.each { - it.entryAttributes.remove('without_test_code') - } -} - // Ensure that JMH sources and resources are treated as test classpath entries // so that they can see test fixtures. // https://github.com/melix/jmh-gradle-plugin/issues/157 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca164914..da9702f9e70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists