Update dependencies and gradle config (#640)

* Update dependencies and gradle config

Include certain dependencies as implementation instead of api so that they are not exposed by default. If you want to use coroutine in your GraphQL API you will need to also include the library

* Include coroutines in graphql-kotlin-spring-server as api dep

* Include coroutines as implementation dep on all modules

* Move deps to api for spring server

* Remove unused gradle props

Co-authored-by: Shane Myrick <[email protected]>

Author: smyrick

build.gradle.kts

@@ -9,7 +9,7 @@ description = "Libraries for running a GraphQL server in Kotlin"
 extra["isReleaseVersion"] = !version.toString().endsWith("SNAPSHOT")
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
+    kotlin("jvm")
     id("org.jetbrains.dokka") apply false
     id("org.jlleitschuh.gradle.ktlint")
     id("io.gitlab.arturbosch.detekt")
@@ -49,6 +49,7 @@ allprojects {
 
 subprojects {
     val kotlinVersion: String by project
+    val kotlinCoroutinesVersion: String by project
     val junitVersion: String by project
     val mockkVersion: String by project
 
@@ -172,8 +173,10 @@ subprojects {
     }
 
     dependencies {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-        testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion")
+        implementation(kotlin("stdlib", kotlinVersion))
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlinCoroutinesVersion")
+        testImplementation(kotlin("test", kotlinVersion))
+        testImplementation(kotlin("test-junit5", kotlinVersion))
         testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
         testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
         testImplementation("io.mockk:mockk:$mockkVersion")

examples/build.gradle.kts

@@ -2,7 +2,7 @@ import io.gitlab.arturbosch.detekt.detekt
 import java.util.Properties
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
+    kotlin("jvm")
     id("org.jlleitschuh.gradle.ktlint")
     id("io.gitlab.arturbosch.detekt")
 }
@@ -41,8 +41,9 @@ subprojects {
     apply(plugin = "org.jlleitschuh.gradle.ktlint")
 
     dependencies {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-        testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion")
+        implementation(kotlin("stdlib", kotlinVersion))
+        implementation("com.expediagroup:graphql-kotlin-spring-server")
+        testImplementation(kotlin("test-junit5", kotlinVersion))
         testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
         testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
     }

examples/federation/base-app/build.gradle.kts

@@ -1,8 +1,6 @@
+description = "An example spring service for federation that implements some basic types"
+
 plugins {
-    id("org.jetbrains.kotlin.plugin.spring")
+    kotlin("plugin.spring")
     id("org.springframework.boot")
 }
-
-dependencies {
-    implementation("com.expediagroup:graphql-kotlin-spring-server")
-}

examples/federation/extend-app/build.gradle.kts

@@ -1,8 +1,6 @@
+description = "An example spring service for federation that extends the basic types with new fields"
+
 plugins {
-    id("org.jetbrains.kotlin.plugin.spring")
+    kotlin("plugin.spring")
     id("org.springframework.boot")
 }
-
-dependencies {
-    implementation("com.expediagroup:graphql-kotlin-spring-server")
-}

examples/settings.gradle.kts

@@ -8,8 +8,8 @@ pluginManagement {
     val springBootVersion: String by properties
 
     plugins {
-        id("org.jetbrains.kotlin.jvm") version kotlinVersion
-        id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
+        kotlin("jvm") version kotlinVersion
+        kotlin("plugin.spring") version kotlinVersion
         id("io.gitlab.arturbosch.detekt") version detektVersion
         id("org.jlleitschuh.gradle.ktlint") version ktlintPluginVersion
         id("org.springframework.boot") version springBootVersion

examples/spring/build.gradle.kts

@@ -1,13 +1,14 @@
+description = "An example GraphQL Spring server"
+
 plugins {
-    id("org.jetbrains.kotlin.plugin.spring")
+    kotlin("plugin.spring")
     id("org.springframework.boot")
 }
 
 val springBootVersion: String by project
 val reactorVersion: String by project
 
 dependencies {
-    implementation("com.expediagroup:graphql-kotlin-spring-server")
     testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
     testImplementation("io.projectreactor:reactor-test:$reactorVersion")
 }

gradle.properties

@@ -14,8 +14,8 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
 
 # dependencies
-kotlinVersion = 1.3.61
-kotlinCoroutinesVersion = 1.3.3
+kotlinVersion = 1.3.70
+kotlinCoroutinesVersion = 1.3.5
 
 graphQLJavaVersion = 14.0
 jacksonVersion = 2.10.2
@@ -27,10 +27,10 @@ reactorExtensionsVersion = 1.0.2.RELEASE
 # test dependency versions
 junitVersion = 5.6.0
 mockkVersion = 1.9.3
-rxjavaVersion = 3.0.0
+rxjavaVersion = 3.0.1
 
 # plugin versions
-detektVersion = 1.5.1
+detektVersion = 1.6.0
 dokkaVersion = 0.10.1
 jacocoVersion = 0.8.5
 ktlintVersion = 0.36.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

graphql-kotlin-schema-generator/build.gradle.kts

@@ -4,16 +4,13 @@ val classGraphVersion: String by project
 val graphQLJavaVersion: String by project
 val jacksonVersion: String by project
 val kotlinVersion: String by project
-val kotlinCoroutinesVersion: String by project
 val rxjavaVersion: String by project
 
 dependencies {
     api("com.graphql-java:graphql-java:$graphQLJavaVersion")
-    // TODO change below from api to implementation?
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlinCoroutinesVersion")
-    api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-    api("io.github.classgraph:classgraph:$classGraphVersion")
     api("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
+    implementation(kotlin("reflect", kotlinVersion))
+    implementation("io.github.classgraph:classgraph:$classGraphVersion")
     testImplementation("io.reactivex.rxjava3:rxjava:$rxjavaVersion")
 }
 

graphql-kotlin-spring-server/build.gradle.kts

@@ -1,8 +1,8 @@
 description = "Spring Boot autoconfiguration library for creating reactive GraphQL server"
 
 plugins {
-    id("org.jetbrains.kotlin.plugin.spring")
-    id("org.jetbrains.kotlin.kapt")
+    kotlin("plugin.spring")
+    kotlin("kapt")
 }
 
 val kotlinCoroutinesVersion: String by project
@@ -13,9 +13,10 @@ val reactorExtensionsVersion: String by project
 dependencies {
     api(project(path = ":graphql-kotlin-federation"))
     api("org.springframework.boot:spring-boot-starter-webflux:$springBootVersion")
-    kapt("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlinCoroutinesVersion")
     api("io.projectreactor.kotlin:reactor-kotlin-extensions:$reactorExtensionsVersion")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinCoroutinesVersion")
+    kapt("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion")
     testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
     testImplementation("io.projectreactor:reactor-test:$reactorVersion")

settings.gradle.kts

@@ -8,9 +8,9 @@ pluginManagement {
     val stagingPluginVersion: String by settings
 
     plugins {
-        id("org.jetbrains.kotlin.jvm") version kotlinVersion
-        id("org.jetbrains.kotlin.kapt") version kotlinVersion
-        id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
+        kotlin("jvm") version kotlinVersion
+        kotlin("kapt") version kotlinVersion
+        kotlin("plugin.spring") version kotlinVersion
         id("io.gitlab.arturbosch.detekt") version detektVersion
         id("org.jlleitschuh.gradle.ktlint") version ktlintPluginVersion
         id("org.jetbrains.dokka") version dokkaVersion