From 36d64ab8343eda7e97a92d71f3378d2d4b8cd3b9 Mon Sep 17 00:00:00 2001 From: Dariusz Kuc Date: Mon, 31 Aug 2020 21:24:56 -0500 Subject: [PATCH] [build] revert Kotlin version to 1.3.72 We are hitting some library and plugin issues with incompatibilities between Kotlin versions. Downgrading back to 1.3.72 for now, we will revisit update to 1.4 sometime in the future. --- gradle.properties | 4 ++-- .../graphql/plugin/gradle/GraphQLGradlePluginAbstractIT.kt | 2 +- plugins/graphql-kotlin-maven-plugin/build.gradle.kts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index a31953f7e2..50300a1778 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,8 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError # dependencies kotlinJvmVersion = 1.8 -kotlinVersion = 1.4.0 -kotlinCoroutinesVersion = 1.3.9 +kotlinVersion = 1.3.72 +kotlinCoroutinesVersion = 1.3.8 classGraphVersion = 4.8.87 graphQLJavaVersion = 15.0 diff --git a/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAbstractIT.kt b/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAbstractIT.kt index 43843f6ec1..a30f713470 100755 --- a/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAbstractIT.kt +++ b/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAbstractIT.kt @@ -35,7 +35,7 @@ abstract class GraphQLGradlePluginAbstractIT { // unsure if there is a better way - correct values are set from Gradle build // when running directly from IDE you will need to manually update those to correct values private val gqlKotlinVersion = System.getProperty("graphQLKotlinVersion") ?: "4.0.0-SNAPSHOT" - private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.4.0" + private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.3.72" private val junitVersion = System.getProperty("junitVersion") ?: "5.6.2" val testSchema = loadResource("mocks/schema.graphql") diff --git a/plugins/graphql-kotlin-maven-plugin/build.gradle.kts b/plugins/graphql-kotlin-maven-plugin/build.gradle.kts index 57e29a1029..52bdd1a881 100644 --- a/plugins/graphql-kotlin-maven-plugin/build.gradle.kts +++ b/plugins/graphql-kotlin-maven-plugin/build.gradle.kts @@ -34,7 +34,6 @@ dependencies { implementation("org.apache.maven:maven-plugin-api:$mavenPluginApiVersion") implementation("org.apache.maven:maven-project:$mavenProjectVersion") implementation("org.apache.maven.plugin-tools:maven-plugin-annotations:$mavenPluginAnnotationVersion") - testImplementation(project(path = ":graphql-kotlin-client")) } tasks {