diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-1.6.10.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-1.6.10.patch deleted file mode 100644 index da7b3b21dae..00000000000 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-1.6.10.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/gradle.properties b/gradle.properties -index c230ac55..0709e478 100644 ---- a/gradle.properties -+++ b/gradle.properties -@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError - - # dependencies - kotlinJvmVersion = 1.8 --kotlinVersion = 1.5.31 -+kotlinVersion = 1.6.10 - kotlinCoroutinesVersion = 1.5.2 - kotlinxSerializationVersion = 1.3.0 - -diff --git a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt -index 871ffd39..c886f705 100644 ---- a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt -+++ b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt -@@ -38,7 +38,6 @@ open class SpringDataFetcher( - private val applicationContext: ApplicationContext - ) : FunctionDataFetcher(target, fn, objectMapper) { - -- @ExperimentalStdlibApi - override fun mapParameterToValue(param: KParameter, environment: DataFetchingEnvironment): Pair? = - if (param.hasAnnotation()) { - val qualifier = param.findAnnotation()?.value -diff --git a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt -index e8939483..5edb33f5 100644 ---- a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt -+++ b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt -@@ -30,7 +30,7 @@ class SubscriptionWebSocketHandler( - private val objectMapper: ObjectMapper - ) : WebSocketHandler { - -- @ExperimentalCoroutinesApi -+ @OptIn(ExperimentalCoroutinesApi::class) - @Suppress("ForbiddenVoid") - override fun handle(session: WebSocketSession): Mono { - val response = session.receive() diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-current.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-current.patch index fd663a6c59a..f98f3266550 100644 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-current.patch +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/graphql-kotlin-current.patch @@ -1,8 +1,8 @@ diff --git a/build.gradle.kts b/build.gradle.kts -index ddc94d0f..d2f5b2f8 100644 +index 22383a2ff..9869bd429 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -21,19 +21,15 @@ plugins { +@@ -20,19 +20,15 @@ plugins { allprojects { buildscript { repositories { @@ -25,48 +25,23 @@ index ddc94d0f..d2f5b2f8 100644 } diff --git a/gradle.properties b/gradle.properties -index c230ac55..cf0412e9 100644 +index ef5b74bd9..526b0052d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError # dependencies kotlinJvmVersion = 1.8 --kotlinVersion = 1.5.31 +-kotlinVersion = 1.6.20 +kotlinVersion = - kotlinCoroutinesVersion = 1.5.2 - kotlinxSerializationVersion = 1.3.0 + kotlinCoroutinesVersion = 1.6.1 + kotlinxSerializationVersion = 1.3.2 -diff --git a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt -index 871ffd39..c886f705 100644 ---- a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt -+++ b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt -@@ -38,7 +38,6 @@ open class SpringDataFetcher( - private val applicationContext: ApplicationContext - ) : FunctionDataFetcher(target, fn, objectMapper) { - -- @ExperimentalStdlibApi - override fun mapParameterToValue(param: KParameter, environment: DataFetchingEnvironment): Pair? = - if (param.hasAnnotation()) { - val qualifier = param.findAnnotation()?.value -diff --git a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt -index e8939483..5edb33f5 100644 ---- a/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt -+++ b/servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt -@@ -30,7 +30,7 @@ class SubscriptionWebSocketHandler( - private val objectMapper: ObjectMapper - ) : WebSocketHandler { - -- @ExperimentalCoroutinesApi -+ @OptIn(ExperimentalCoroutinesApi::class) - @Suppress("ForbiddenVoid") - override fun handle(session: WebSocketSession): Mono { - val response = session.receive() diff --git a/settings.gradle.kts b/settings.gradle.kts -index 1a1329f8..c8aba3da 100644 +index f6fa7cee5..5bbb4828a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts -@@ -8,6 +8,11 @@ pluginManagement { +@@ -9,6 +9,11 @@ pluginManagement { val pluginPublishPluginVersion: String by settings val springBootVersion: String by settings diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/graphql-kotlin.benchmark.kts b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/graphql-kotlin.benchmark.kts index 5066b6becc8..e28467306ac 100644 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/graphql-kotlin.benchmark.kts +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/graphql-kotlin.benchmark.kts @@ -9,15 +9,11 @@ @file:BenchmarkProject( name = "graphql-kotlin", gitUrl = "https://github.com/ExpediaGroup/graphql-kotlin.git", - gitCommitSha = "fac1e41914f6a8a0a494082752a4e3674b812a3f" + gitCommitSha = "a0a8bad009a4ddbf88ce5c30200f90a091bd3df7" ) import java.io.File -val stableReleasePatch = { - "graphql-kotlin-1.6.10.patch" to File("benchmarkScripts/files/graphql-kotlin-1.6.10.patch").inputStream() -} - val currentReleasePatch = { "graphql-kotlin-current.patch" to File("benchmarkScripts/files/graphql-kotlin-current.patch") .readText() @@ -68,7 +64,7 @@ runAllBenchmarks( } }, mapOf( - "1.6.10" to stableReleasePatch, - "1.6.20" to currentReleasePatch + "1.6.20" to null, + "1.7.0" to currentReleasePatch ) ) diff --git a/libraries/tools/gradle/regression-benchmarks/build.gradle.kts b/libraries/tools/gradle/regression-benchmarks/build.gradle.kts index e1ce711a541..d85f5a49394 100644 --- a/libraries/tools/gradle/regression-benchmarks/build.gradle.kts +++ b/libraries/tools/gradle/regression-benchmarks/build.gradle.kts @@ -134,5 +134,6 @@ addBenchmarkTask( addBenchmarkTask( taskName = "benchmarkRegressionGraphql", - script = "graphql-kotlin.benchmark.kts" + script = "graphql-kotlin.benchmark.kts", + JavaLanguageVersion.of(11) )