Update to kotlin 1.5 (#1176)

* Update to kotlin 1.5

* Fix client generation unit tests

* Fix :graphql-kotlin-client-generator:test

Author: smyrick

clients/graphql-kotlin-client-serialization/build.gradle.kts

@@ -20,7 +20,7 @@ tasks {
                 limit {
                     counter = "INSTRUCTION"
                     value = "COVEREDRATIO"
-                    minimum = "0.77".toBigDecimal()
+                    minimum = "0.74".toBigDecimal()
                 }
             }
         }

generator/graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/hooks/FlowSubscriptionSchemaGeneratorHooksTest.kt

@@ -21,27 +21,28 @@ import kotlinx.coroutines.flow.emptyFlow
 import org.junit.jupiter.api.Test
 import java.util.concurrent.CompletableFuture
 import kotlin.reflect.full.createType
-import kotlin.reflect.jvm.reflect
+import kotlin.reflect.jvm.ExperimentalReflectionOnLambdas
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 
+@ExperimentalReflectionOnLambdas
 class FlowSubscriptionSchemaGeneratorHooksTest {
 
     val hooks = FlowSubscriptionSchemaGeneratorHooks()
 
     @Test
     fun `willResolveMonad unwraps Flow`() {
-        val type = assertNotNull(TestQuery::getFlow.reflect()?.returnType)
+        val type = assertNotNull(TestQuery::getFlow.returnType)
         val result = hooks.willResolveMonad(type)
         assertEquals(String::class.createType(), result)
     }
 
     @Test
     fun `willResolveMonad does nothing on any other type`() {
-        val stringType = assertNotNull(TestQuery::getString.reflect()?.returnType)
-        val cfType = assertNotNull(TestQuery::getCompletableFuture.reflect()?.returnType)
+        val stringType = assertNotNull(TestQuery::getString.returnType)
+        val cfType = assertNotNull(TestQuery::getCompletableFuture.returnType)
 
         assertEquals(stringType, hooks.willResolveMonad(stringType))
         assertEquals(cfType, hooks.willResolveMonad(cfType))

gradle.properties

@@ -15,16 +15,16 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
 
 # dependencies
 kotlinJvmVersion = 1.8
-kotlinVersion = 1.4.32
-kotlinCoroutinesVersion = 1.4.3
-kotlinxSerializationVersion = 1.1.0
+kotlinVersion = 1.5.10
+kotlinCoroutinesVersion = 1.5.0
+kotlinxSerializationVersion = 1.2.1
 
 classGraphVersion = 4.8.103
 federationGraphQLVersion = 0.6.3
 graphQLJavaVersion = 16.2
 jacksonVersion = 2.11.4
-kotlinPoetVersion = 1.7.2
-ktorVersion = 1.5.2
+kotlinPoetVersion = 1.8.0
+ktorVersion = 1.5.4
 reactorVersion = 3.4.4
 reactorExtensionsVersion = 1.1.3
 slf4jVersion = 1.7.30
@@ -42,7 +42,7 @@ wireMockVersion = 2.27.2
 # plugin versions
 detektVersion = 1.17.1
 dokkaVersion = 1.4.30
-jacocoVersion = 0.8.6
+jacocoVersion = 0.8.7
 ktlintVersion = 0.41.0
 ktlintPluginVersion = 10.0.0
 mavenPluginDevelopmentVersion = 0.3.1

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt

@@ -24,12 +24,12 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
-  public abstract val id: Int
+  public val id: Int
 
   /**
    * Name field
    */
-  public abstract val name: String
+  public val name: String
 }
 
 /**

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt

@@ -24,7 +24,7 @@ public interface BasicInterface2 {
   /**
    * Name field
    */
-  public abstract val name: String
+  public val name: String
 }
 
 /**

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt

@@ -23,7 +23,7 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
-  public abstract val id: Int
+  public val id: Int
 }
 
 /**

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt

@@ -24,7 +24,7 @@ public interface BasicInterface2 {
   /**
    * Unique identifier of an interface
    */
-  public abstract val id: Int
+  public val id: Int
 }
 
 /**

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt

@@ -24,12 +24,12 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
-  public abstract val id: Int
+  public val id: Int
 
   /**
    * Name field
    */
-  public abstract val name: String
+  public val name: String
 }
 
 /**

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/DetailsObject.kt

@@ -14,5 +14,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject.kt

@@ -15,7 +15,7 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String,
+  public val `value`: String,
   /**
    * Boolean flag
    */

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject2.kt

@@ -14,5 +14,5 @@ public data class DetailsObject2(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/DetailsObject.kt

@@ -9,5 +9,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject.kt

@@ -14,5 +14,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/DetailsObject.kt

@@ -9,5 +9,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/UUID.kt

@@ -10,7 +10,7 @@ import kotlin.jvm.JvmStatic
  * Custom scalar representing UUID
  */
 public data class UUID(
-  public val value: java.util.UUID
+  public val `value`: java.util.UUID
 ) {
   @JsonValue
   public fun rawValue() = converter.toJson(value)

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt

@@ -24,12 +24,12 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
-  public abstract val id: Int
+  public val id: Int
 
   /**
    * Name field
    */
-  public abstract val name: String
+  public val name: String
 }
 
 /**

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/DetailsObject.kt

@@ -19,5 +19,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/UUID.kt

@@ -17,15 +17,15 @@ import kotlinx.serialization.json.jsonPrimitive
  */
 @Serializable(with = UUIDSerializer::class)
 public data class UUID(
-  public val value: java.util.UUID
+  public val `value`: java.util.UUID
 )
 
 public class UUIDSerializer : KSerializer<UUID> {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
   public override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("UUID", STRING)
 
-  public override fun serialize(encoder: Encoder, value: UUID): Unit {
+  public override fun serialize(encoder: Encoder, `value`: UUID): Unit {
     val encoded = converter.toJson(value.value)
     encoder.encodeString(encoded.toString())
   }

plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/DetailsObject.kt

@@ -21,5 +21,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/UUID.kt

@@ -17,15 +17,15 @@ import kotlinx.serialization.json.jsonPrimitive
  */
 @Serializable(with = UUIDSerializer::class)
 public data class UUID(
-  public val value: java.util.UUID
+  public val `value`: java.util.UUID
 )
 
 public class UUIDSerializer : KSerializer<UUID> {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
   public override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("UUID", STRING)
 
-  public override fun serialize(encoder: Encoder, value: UUID): Unit {
+  public override fun serialize(encoder: Encoder, `value`: UUID): Unit {
     val encoded = converter.toJson(value.value)
     encoder.encodeString(encoded.toString())
   }

plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/DetailsObject.kt

@@ -21,5 +21,5 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
-  public val value: String
+  public val `value`: String
 )

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLDownloadSDLTaskIT.kt

@@ -156,6 +156,6 @@ class GraphQLDownloadSDLTaskIT : GraphQLGradlePluginAbstractIT() {
 
         println(result.output)
         assertEquals(TaskOutcome.FAILED, result.task(":$DOWNLOAD_SDL_TASK_NAME")?.outcome)
-        assertTrue(result.output.contains("Request timeout has been expired", ignoreCase = true))
+        assertTrue(result.output.contains("Request timeout has expired", ignoreCase = true))
     }
 }

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLIntrospectSchemaTaskIT.kt

@@ -75,7 +75,7 @@ class GraphQLIntrospectSchemaTaskIT : GraphQLGradlePluginAbstractIT() {
             """
             |val graphqlIntrospectSchema by tasks.getting(GraphQLIntrospectSchemaTask::class) {
             |  endpoint.set("${wireMockServer.baseUrl()}/graphql")
-            |  timeoutConfig.set(TimeoutConfiguration(connect = 100, read = 100))
+            |  timeoutConfig.set(com.expediagroup.graphql.plugin.gradle.config.TimeoutConfiguration(connect = 100, read = 100))
             |}
             """.trimMargin()
         testProjectDirectory.generateBuildFileForClient(buildFileContents)
@@ -152,6 +152,6 @@ class GraphQLIntrospectSchemaTaskIT : GraphQLGradlePluginAbstractIT() {
             .buildAndFail()
 
         assertEquals(TaskOutcome.FAILED, result.task(":$INTROSPECT_SCHEMA_TASK_NAME")?.outcome)
-        assertTrue(result.output.contains("Request timeout has been expired", ignoreCase = true))
+        assertTrue(result.output.contains("Request timeout has expired", ignoreCase = true))
     }
 }