Skip to content

Commit 9da31f2

Browse files
authored
Dependency update (ExpediaGroup#1264)
* Dependency update * Jackson matching spring version * Update gradle.properties * Update manual kotlin versions * Update other hardcoded versions
1 parent a26a317 commit 9da31f2

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

gradle.properties

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
1515

1616
# dependencies
1717
kotlinJvmVersion = 1.8
18-
kotlinVersion = 1.5.21
19-
kotlinCoroutinesVersion = 1.5.1
20-
kotlinxSerializationVersion = 1.2.2
18+
kotlinVersion = 1.5.31
19+
kotlinCoroutinesVersion = 1.5.2
20+
kotlinxSerializationVersion = 1.3.0
2121

2222
androidPluginVersion = 7.0.1
23-
classGraphVersion = 4.8.115
23+
classGraphVersion = 4.8.123
2424
federationGraphQLVersion = 0.6.5
25-
graphQLJavaVersion = 17.2
25+
graphQLJavaVersion = 17.3
2626
jacksonVersion = 2.12.5
27-
kotlinPoetVersion = 1.9.0
27+
kotlinPoetVersion = 1.10.1
2828
ktorVersion = 1.6.3
2929
reactorVersion = 3.4.9
3030
reactorExtensionsVersion = 1.1.3
31-
slf4jVersion = 1.7.30
32-
springBootVersion = 2.5.3
33-
springVersion = 5.3.9
31+
slf4jVersion = 1.7.32
32+
springBootVersion = 2.5.5
33+
springVersion = 5.3.10
3434

3535
# test dependency versions
3636
compileTestingVersion = 1.4.3

plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
}
1818

1919
val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
20-
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.21"
20+
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.31"
2121
dependencies {
2222
implementation("com.expediagroup:graphql-kotlin-ktor-client:$graphQLKotlinVersion")
2323
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111

1212
val androidPluginVersion = System.getenv("ANDROID_PLUGIN_VERSION") ?: "7.0.1"
1313
val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
14-
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.21"
14+
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.31"
1515
dependencies {
1616
classpath("com.android.tools.build:gradle:$androidPluginVersion")
1717
classpath("com.expediagroup:graphql-kotlin-gradle-plugin:$graphQLKotlinVersion")

plugins/graphql-kotlin-gradle-plugin/src/integration/client-generator/custom_scalars/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ buildscript {
1919
}
2020

2121
plugins {
22-
id("org.springframework.boot") version "2.5.3"
23-
kotlin("jvm") version "1.5.20"
24-
kotlin("plugin.spring") version "1.5.20"
22+
id("org.springframework.boot") version "2.5.5"
23+
kotlin("jvm") version "1.5.31"
24+
kotlin("plugin.spring") version "1.5.31"
2525
}
2626

2727
apply(plugin = "com.expediagroup.graphql")
@@ -41,8 +41,8 @@ repositories {
4141
val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
4242
val icuVersion = System.getenv("ICU_VERSION") ?: "69.1"
4343
val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.7.2"
44-
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.20"
45-
val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.5.3"
44+
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.31"
45+
val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.5.5"
4646
dependencies {
4747
implementation("com.expediagroup:graphql-kotlin-hooks-provider:$graphQLKotlinVersion")
4848
implementation("com.expediagroup:graphql-kotlin-spring-client:$graphQLKotlinVersion")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GraphQLGenerateClientIT {
3535
sourceDirectory.copyRecursively(testProjectDirectory)
3636

3737
val junitVersion = System.getProperty("junitVersion") ?: "5.7.2"
38-
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.21"
38+
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.31"
3939
val mockkVersion = System.getProperty("mockkVersion") ?: "1.11.0"
4040
val buildResult = GradleRunner.create()
4141
.withProjectDir(testProjectDirectory)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ abstract class GraphQLGradlePluginAbstractIT {
3535

3636
// unsure if there is a better way - correct values are set from Gradle build
3737
// when running directly from IDE you will need to manually update those to correct values
38-
private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.21"
38+
private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.31"
3939
private val junitVersion = System.getProperty("junitVersion") ?: "5.7.2"
40-
private val springBootVersion = System.getProperty("springBootVersion") ?: "2.5.3"
40+
private val springBootVersion = System.getProperty("springBootVersion") ?: "2.5.5"
4141

4242
val testSchema = loadResource("mocks/schema.graphql")
4343
val introspectionResult = loadResource("mocks/IntrospectionResult.json")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class GraphQLGradlePluginAndroidIT {
3737
val testProjectDirectory = tempDir.toFile()
3838
sourceDirectory.copyRecursively(testProjectDirectory)
3939

40-
val androidPluginVersion = System.getProperty("androidPluginVersion") ?: "4.2.2"
41-
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.21"
40+
val androidPluginVersion = System.getProperty("androidPluginVersion") ?: "7.0.1"
41+
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.31"
4242
val buildResult = GradleRunner.create()
4343
.withProjectDir(testProjectDirectory)
4444
.withPluginClasspath()

0 commit comments

Comments
 (0)