Skip to content

Commit

Permalink
Dependency update (#1264)
Browse files Browse the repository at this point in the history
* Dependency update

* Jackson matching spring version

* Update gradle.properties

* Update manual kotlin versions

* Update other hardcoded versions
  • Loading branch information
smyrick authored Oct 8, 2021
1 parent a26a317 commit 9da31f2
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError

# dependencies
kotlinJvmVersion = 1.8
kotlinVersion = 1.5.21
kotlinCoroutinesVersion = 1.5.1
kotlinxSerializationVersion = 1.2.2
kotlinVersion = 1.5.31
kotlinCoroutinesVersion = 1.5.2
kotlinxSerializationVersion = 1.3.0

androidPluginVersion = 7.0.1
classGraphVersion = 4.8.115
classGraphVersion = 4.8.123
federationGraphQLVersion = 0.6.5
graphQLJavaVersion = 17.2
graphQLJavaVersion = 17.3
jacksonVersion = 2.12.5
kotlinPoetVersion = 1.9.0
kotlinPoetVersion = 1.10.1
ktorVersion = 1.6.3
reactorVersion = 3.4.9
reactorExtensionsVersion = 1.1.3
slf4jVersion = 1.7.30
springBootVersion = 2.5.3
springVersion = 5.3.9
slf4jVersion = 1.7.32
springBootVersion = 2.5.5
springVersion = 5.3.10

# test dependency versions
compileTestingVersion = 1.4.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {
}

val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.21"
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.31"
dependencies {
implementation("com.expediagroup:graphql-kotlin-ktor-client:$graphQLKotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {

val androidPluginVersion = System.getenv("ANDROID_PLUGIN_VERSION") ?: "7.0.1"
val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.21"
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.31"
dependencies {
classpath("com.android.tools.build:gradle:$androidPluginVersion")
classpath("com.expediagroup:graphql-kotlin-gradle-plugin:$graphQLKotlinVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ buildscript {
}

plugins {
id("org.springframework.boot") version "2.5.3"
kotlin("jvm") version "1.5.20"
kotlin("plugin.spring") version "1.5.20"
id("org.springframework.boot") version "2.5.5"
kotlin("jvm") version "1.5.31"
kotlin("plugin.spring") version "1.5.31"
}

apply(plugin = "com.expediagroup.graphql")
Expand All @@ -41,8 +41,8 @@ repositories {
val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
val icuVersion = System.getenv("ICU_VERSION") ?: "69.1"
val junitVersion = System.getenv("JUNIT_VERSION") ?: "5.7.2"
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.20"
val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.5.3"
val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.31"
val springBootVersion = System.getenv("SPRINGBOOT_VERSION") ?: "2.5.5"
dependencies {
implementation("com.expediagroup:graphql-kotlin-hooks-provider:$graphQLKotlinVersion")
implementation("com.expediagroup:graphql-kotlin-spring-client:$graphQLKotlinVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class GraphQLGenerateClientIT {
sourceDirectory.copyRecursively(testProjectDirectory)

val junitVersion = System.getProperty("junitVersion") ?: "5.7.2"
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.21"
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.31"
val mockkVersion = System.getProperty("mockkVersion") ?: "1.11.0"
val buildResult = GradleRunner.create()
.withProjectDir(testProjectDirectory)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ 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 kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.21"
private val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.31"
private val junitVersion = System.getProperty("junitVersion") ?: "5.7.2"
private val springBootVersion = System.getProperty("springBootVersion") ?: "2.5.3"
private val springBootVersion = System.getProperty("springBootVersion") ?: "2.5.5"

val testSchema = loadResource("mocks/schema.graphql")
val introspectionResult = loadResource("mocks/IntrospectionResult.json")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class GraphQLGradlePluginAndroidIT {
val testProjectDirectory = tempDir.toFile()
sourceDirectory.copyRecursively(testProjectDirectory)

val androidPluginVersion = System.getProperty("androidPluginVersion") ?: "4.2.2"
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.21"
val androidPluginVersion = System.getProperty("androidPluginVersion") ?: "7.0.1"
val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.5.31"
val buildResult = GradleRunner.create()
.withProjectDir(testProjectDirectory)
.withPluginClasspath()
Expand Down

0 comments on commit 9da31f2

Please sign in to comment.