build: use typesafe project accessors

See: https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:type-safe-project-accessors
ExpediaGroup · Jan 13, 2023 · b1a2d53 · b1a2d53
1 parent 381673e
commit b1a2d53
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 32 deletions.
diff --git a/clients/graphql-kotlin-client-jackson/build.gradle.kts b/clients/graphql-kotlin-client-jackson/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-client"))
+    api(projects.graphqlKotlinClient)
     api(libs.jackson)
 }
 

diff --git a/clients/graphql-kotlin-client-serialization/build.gradle.kts b/clients/graphql-kotlin-client-serialization/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-client"))
+    api(projects.graphqlKotlinClient)
     api(libs.kotlinx.coroutines.core)
     api(libs.kotlinx.serialization.json)
 }

diff --git a/clients/graphql-kotlin-ktor-client/build.gradle.kts b/clients/graphql-kotlin-ktor-client/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-client"))
-    api(project(path = ":graphql-kotlin-client-serialization"))
+    api(projects.graphqlKotlinClient)
+    api(projects.graphqlKotlinClientSerialization)
     api(libs.ktor.client.cio)
     api(libs.ktor.client.serialization)
-    testImplementation(project(path = ":graphql-kotlin-client-jackson"))
+    testImplementation(projects.graphqlKotlinClientJackson)
     testImplementation(libs.ktor.client.logging)
     testImplementation(libs.ktor.client.okhttp)
     testImplementation(libs.wiremock.jre8)

diff --git a/clients/graphql-kotlin-spring-client/build.gradle.kts b/clients/graphql-kotlin-spring-client/build.gradle.kts
@@ -7,12 +7,12 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-client"))
-    api(project(path = ":graphql-kotlin-client-jackson"))
+    api(projects.graphqlKotlinClient)
+    api(projects.graphqlKotlinClientJackson)
     api(libs.kotlinx.coroutines.reactor)
     api(libs.spring.webflux)
     api(libs.spring.boot.netty)
-    testImplementation(project(path = ":graphql-kotlin-client-serialization"))
+    testImplementation(projects.graphqlKotlinClientSerialization)
     testImplementation(libs.wiremock.jre8)
 }
 

diff --git a/executions/graphql-kotlin-dataloader-instrumentation/build.gradle.kts b/executions/graphql-kotlin-dataloader-instrumentation/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-dataloader"))
+    api(projects.graphqlKotlinDataloader)
     api(libs.graphql.java) {
         exclude(group = "com.graphql-java", module = "java-dataloader")
     }

diff --git a/generator/graphql-kotlin-federation/build.gradle.kts b/generator/graphql-kotlin-federation/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-schema-generator"))
+    api(projects.graphqlKotlinSchemaGenerator)
     api(libs.federation)
     testImplementation(libs.reactor.core)
     testImplementation(libs.reactor.extensions)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -54,6 +54,7 @@ dataloader = { group = "com.graphql-java", name = "java-dataloader", version.ref
 federation = { group = "com.apollographql.federation", name = "federation-graphql-java-support", version.ref = "federation" }
 graphql-java = { group = "com.graphql-java", name = "graphql-java", version.ref = "graphql-java" }
 jackson = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson" }
+kotlin-gradle-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api", version.ref = "kotlin" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 kotlin-serialization = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref= "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }

diff --git a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-client"))
+    api(projects.graphqlKotlinClient)
     api(libs.graphql.java) {
         exclude(group = "com.graphql-java", module = "java-dataloader")
     }
@@ -19,8 +19,8 @@ dependencies {
     }
     implementation(libs.ktor.client.content)
     implementation(libs.slf4j)
-    testImplementation(project(path = ":graphql-kotlin-client-jackson"))
-    testImplementation(project(path = ":graphql-kotlin-client-serialization"))
+    testImplementation(projects.graphqlKotlinClientJackson)
+    testImplementation(projects.graphqlKotlinClientSerialization)
     testImplementation(libs.wiremock.jre8)
     testImplementation(libs.compile.testing)
     testImplementation(libs.icu)

diff --git a/plugins/graphql-kotlin-gradle-plugin/build.gradle.kts b/plugins/graphql-kotlin-gradle-plugin/build.gradle.kts
@@ -10,11 +10,11 @@ plugins {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin-api"))
+    implementation(libs.kotlin.gradle.api)
     compileOnly(libs.android.plugin)
 
-    compileOnly(project(":graphql-kotlin-client-generator"))
-    compileOnly(project(":graphql-kotlin-sdl-generator"))
+    compileOnly(projects.graphqlKotlinClientGenerator)
+    compileOnly(projects.graphqlKotlinSdlGenerator)
 
     testImplementation(libs.wiremock.jre8)
     testImplementation(libs.mustache)

diff --git a/plugins/graphql-kotlin-maven-plugin/build.gradle.kts b/plugins/graphql-kotlin-maven-plugin/build.gradle.kts
@@ -16,14 +16,14 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-client-generator"))
-    api(project(path = ":graphql-kotlin-sdl-generator"))
+    api(projects.graphqlKotlinClientGenerator)
+    api(projects.graphqlKotlinSdlGenerator)
     api(libs.kotlinx.coroutines.core)
     implementation(libs.maven.plugin.annotations)
     implementation(libs.maven.plugin.api)
     implementation(libs.maven.project)
-    testImplementation(project(path = ":graphql-kotlin-spring-server"))
-    testImplementation(project(path = ":graphql-kotlin-federated-hooks-provider"))
+    testImplementation(projects.graphqlKotlinSpringServer)
+    testImplementation(projects.graphqlKotlinFederatedHooksProvider)
 }
 
 tasks {

diff --git a/plugins/schema/graphql-kotlin-federated-hooks-provider/build.gradle.kts b/plugins/schema/graphql-kotlin-federated-hooks-provider/build.gradle.kts
@@ -5,6 +5,6 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":graphql-kotlin-federation"))
-    implementation(project(":graphql-kotlin-hooks-provider"))
+    implementation(projects.graphqlKotlinFederation)
+    implementation(projects.graphqlKotlinHooksProvider)
 }
diff --git a/plugins/schema/graphql-kotlin-hooks-provider/build.gradle.kts b/plugins/schema/graphql-kotlin-hooks-provider/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":graphql-kotlin-schema-generator"))
+    implementation(projects.graphqlKotlinSchemaGenerator)
 }
diff --git a/plugins/schema/graphql-kotlin-sdl-generator/build.gradle.kts b/plugins/schema/graphql-kotlin-sdl-generator/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 dependencies {
-    implementation(project(path = ":graphql-kotlin-hooks-provider"))
-    implementation(project(path = ":graphql-kotlin-server"))
-    implementation(project(path = ":graphql-kotlin-federation"))
+    implementation(projects.graphqlKotlinHooksProvider)
+    implementation(projects.graphqlKotlinServer)
+    implementation(projects.graphqlKotlinFederation)
     implementation(libs.classgraph)
     implementation(libs.slf4j)
-    testImplementation(project(path = ":graphql-kotlin-spring-server"))
+    testImplementation(projects.graphqlKotlinSpringServer)
 }
 
 sourceSets {

diff --git a/servers/graphql-kotlin-server/build.gradle.kts b/servers/graphql-kotlin-server/build.gradle.kts
@@ -9,9 +9,9 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-schema-generator"))
-    api(project(path = ":graphql-kotlin-dataloader-instrumentation"))
-    api(project(path = ":graphql-kotlin-automatic-persisted-queries"))
+    api(projects.graphqlKotlinSchemaGenerator)
+    api(projects.graphqlKotlinDataloaderInstrumentation)
+    api(projects.graphqlKotlinAutomaticPersistedQueries)
     api(libs.jackson)
     testImplementation(libs.kotlinx.coroutines.test)
 }

diff --git a/servers/graphql-kotlin-spring-server/build.gradle.kts b/servers/graphql-kotlin-spring-server/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 }
 
 dependencies {
-    api(project(path = ":graphql-kotlin-server"))
-    api(project(path = ":graphql-kotlin-federation"))
+    api(projects.graphqlKotlinServer)
+    api(projects.graphqlKotlinFederation)
     api(libs.spring.boot.webflux)
     api(libs.kotlinx.coroutines.jdk8)
     api(libs.kotlinx.coroutines.reactor)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,7 @@
 rootProject.name = "graphql-kotlin"
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 // Clients
 include(":graphql-kotlin-client")
 include(":graphql-kotlin-client-serialization")
@@ -27,6 +29,7 @@ include(":graphql-kotlin-spring-server")
 include(":graphql-kotlin-dataloader")
 include(":graphql-kotlin-dataloader-instrumentation")
 include(":graphql-kotlin-automatic-persisted-queries")
+
 //
 // Project mappings so we don't need to create projects that group subprojects
 //