Skip to content

Commit

Permalink
Bump develocity gradle plugin, and apollo-published (#5883)
Browse files Browse the repository at this point in the history
* Bump develocity gradle plugin

* Bump apollo-published
  • Loading branch information
BoD committed May 13, 2024
1 parent 38af25f commit c828848
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions benchmark/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement {
includeBuild("build-logic")
}
plugins {
id("com.gradle.develocity") version "3.17.2" // sync with libraries.toml
id("com.gradle.develocity") version "3.17.3" // sync with libraries.toml
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
Expand All @@ -28,4 +28,4 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
}
}

includeBuild("../")
includeBuild("../")
2 changes: 1 addition & 1 deletion build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.gradle.develocity") version "3.17.2" // sync with libraries.toml
id("com.gradle.develocity") version "3.17.3" // sync with libraries.toml
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/libraries.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ androidx-sqlite = "2.3.1"
# This is used by the gradle integration tests to get the artifacts locally
apollo = "4.0.0-beta.7-SNAPSHOT"
# Used by the apollo-tooling project which uses a published version of Apollo
apollo-published = "4.0.0-beta.3"
apollo-published = "4.0.0-beta.6"
atomicfu = "0.23.1"
cache = "2.0.2"
compose = "1.5.1"
Expand Down Expand Up @@ -100,7 +100,7 @@ clikt = { group = "com.github.ajalt.clikt", name = "clikt", version = "3.5.2" }
compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose" }
compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
dokkatoo = "dev.adamko.dokkatoo:dokkatoo-plugin:2.1.0"
dgp = "com.gradle:develocity-gradle-plugin:3.17.2" # // sync with settings.gradle.kts
dgp = "com.gradle:develocity-gradle-plugin:3.17.3" # // sync with settings.gradle.kts
# Not updating because it fails in apollo-compiler Java tests with
# annotation @org.jetbrains.annotations.Nullable not applicable in this type context
google-testing-compile = { group = "com.google.testing.compile", name = "compile-testing", version = "0.19" }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
extend schema @link(url: "https://specs.apollo.dev/nullability/v0.1", import: ["@catch", "CatchTo"])
extend schema @link(url: "https://specs.apollo.dev/nullability/v0.3", import: ["@catch", "CatchTo"])
extend schema @catch(to: THROW)
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
extend schema @link(url: "https://specs.apollo.dev/nullability/v0.1", import: ["@semanticNonNull", "@catch", "CatchTo"])
extend schema @link(url: "https://specs.apollo.dev/nullability/v0.3", import: ["@semanticNonNull", "@semanticNonField", "@catch", "CatchTo"])
extend schema @catch(to: THROW)

extend type Service @semanticNonNull(field: "statsWindow")
extend type ServiceMutation @semanticNonNull(field: "registerOperationsWithResponse")
extend type ServiceStatsWindow @semanticNonNull(field: "fieldLatencies")
extend type RegisterOperationsMutationResponse @semanticNonNull(field: "invalidOperations")
extend type Service @semanticNonNullField(name: "statsWindow")
extend type ServiceMutation @semanticNonNullField(name: "registerOperationsWithResponse")
extend type ServiceStatsWindow @semanticNonNullField(name: "fieldLatencies")
extend type RegisterOperationsMutationResponse @semanticNonNullField(name: "invalidOperations")
# Not sure if errors can be null or not
# extend type InvalidOperation @semanticNonNull(field: "errors")
# extend type InvalidOperation @semanticNonNull(field: "errors")
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extend schema @link(url: "https://specs.apollo.dev/nullability/v0.1", import: ["@semanticNonNull", "@catch", "CatchTo"])
extend schema @link(url: "https://specs.apollo.dev/nullability/v0.3", import: ["@semanticNonNull", "@semanticNonField", "@catch", "CatchTo"])
extend schema @catch(to: THROW)

extend type GraphMutation @semanticNonNull(field: "uploadSchema")
extend type GraphMutation @semanticNonNull(field: "publishSubgraph")
extend type GraphVariant @semanticNonNull(field: "latestPublication")
extend type SchemaPublication @semanticNonNull(field: "schema")
extend type GraphMutation @semanticNonNullField(name: "uploadSchema")
extend type GraphMutation @semanticNonNullField(name: "publishSubgraph")
extend type GraphVariant @semanticNonNullField(name: "latestPublication")
extend type SchemaPublication @semanticNonNullField(name: "schema")
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pluginManagement {
}

plugins {
id("com.gradle.develocity") version "3.17.2" // sync with libraries.toml
id("com.gradle.develocity") version "3.17.3" // sync with libraries.toml
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pluginManagement {
}

plugins {
id("com.gradle.develocity") version "3.17.2" // sync with libraries.toml
id("com.gradle.develocity") version "3.17.3" // sync with libraries.toml
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
Expand Down

0 comments on commit c828848

Please sign in to comment.