Skip to content

Commit 69f6672

Browse files
authored
Revert "Bump Gradle to 8.12 (#6354)" (#6364)
This reverts commit 3ac7a04. See gradle/gradle#32045
1 parent 484e734 commit 69f6672

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

tests/build.gradle.kts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
buildscript {
2-
dependencies {
3-
classpath("com.apollographql.apollo.build:build-logic")
4-
}
5-
repositories {
6-
/*
7-
* This duplicates the repositories in repositories.gradle.kts but I haven't found a way to make it work otherwise
8-
* See https://github.com/gradle/gradle/issues/32045
9-
*/
10-
mavenCentral()
11-
google()
12-
gradlePluginPortal()
13-
}
1+
plugins {
2+
id("build.logic") apply false
143
}
4+
155
val ciBuild = tasks.register("ciBuild") {
166
description = """Execute the 'build' task in subprojects and the `termination:run` task too"""
177
subprojects {

tests/settings.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
pluginManagement {
2+
includeBuild("../build-logic")
3+
}
4+
15
plugins {
26
id("com.gradle.develocity") version "3.19" // sync with libraries.toml
37
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
@@ -23,7 +27,6 @@ rootProject.projectDir
2327
}
2428

2529
includeBuild("../")
26-
includeBuild("../build-logic")
2730

2831
dependencyResolutionManagement {
2932
versionCatalogs {

0 commit comments

Comments
 (0)