Skip to content

Commit

Permalink
Revert "Bump Gradle to 8.12 (#6354)" (#6364)
Browse files Browse the repository at this point in the history
This reverts commit 3ac7a04.

See gradle/gradle#32045
  • Loading branch information
martinbonnin authored Jan 24, 2025
1 parent 484e734 commit 69f6672
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
16 changes: 3 additions & 13 deletions tests/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
buildscript {
dependencies {
classpath("com.apollographql.apollo.build:build-logic")
}
repositories {
/*
* This duplicates the repositories in repositories.gradle.kts but I haven't found a way to make it work otherwise
* See https://github.com/gradle/gradle/issues/32045
*/
mavenCentral()
google()
gradlePluginPortal()
}
plugins {
id("build.logic") apply false
}

val ciBuild = tasks.register("ciBuild") {
description = """Execute the 'build' task in subprojects and the `termination:run` task too"""
subprojects {
Expand Down
5 changes: 4 additions & 1 deletion tests/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pluginManagement {
includeBuild("../build-logic")
}

plugins {
id("com.gradle.develocity") version "3.19" // sync with libraries.toml
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.2"
Expand All @@ -23,7 +27,6 @@ rootProject.projectDir
}

includeBuild("../")
includeBuild("../build-logic")

dependencyResolutionManagement {
versionCatalogs {
Expand Down

0 comments on commit 69f6672

Please sign in to comment.