Skip to content

Commit

Permalink
Upgrade Kotlin, Kotlin Poet, and Kotlinter
Browse files Browse the repository at this point in the history 
Upgrading to Kotlin 1.7.0
=========================

Upgrade to 'com.squareup:kotlinpoet:1.12.0' and 'com.github.ajalt.clikt:clikt:3.5.0' brought Kotlin 1.7.0 so decided
to upgrade the project as well. If we want to revert moving to Kotlin
1.7.0 we will need to pin clickt and kotlinpoet to 3.4.+ and 1.11.+ respectively.

Upgrading to Kotlinter 3.11.1
=============================

Moving to kotlinter 3.11.1 since 3.6.0 was creating problems with tests
since, it appeared, that it was taking into account string template blocks
as part of the code.

Other Fixes
===========

* Make sure we run the CI job on every push and not only when the PR is opened
* Remove the `.env` file, use `sdk env` instead
  • Loading branch information
@berngp
berngp committed Jun 28, 2022
1 parent 6438bc2 commit ee0011f
Show file tree
Hide file tree
Showing 160 changed files with 1,156 additions and 969 deletions.
1 change: 0 additions & 1 deletion .env
View file

This file was deleted.

29 changes: 21 additions & 8 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@
*
*/


plugins {
id 'org.jetbrains.kotlin.jvm' version '1.6.21' apply false
id 'org.jetbrains.kotlin.jvm' version "1.7.0" apply false
id 'nebula.netflixoss' version '10.6.0'
id "org.jmailen.kotlinter" version "3.6.0"
id "org.jmailen.kotlinter" version "3.11.1"
}

description = 'Netflix GraphQL DGS Code Generation'

allprojects {

ext {
Versions = [
KOTLIN_VERSION: '1.7.0'
]
}

repositories {
mavenCentral()
}
Expand All @@ -37,24 +43,31 @@ allprojects {
group = 'com.netflix.graphql.dgs.codegen'

dependencies {
testImplementation "org.jetbrains.kotlin:kotlin-compiler:${Versions.KOTLIN_VERSION}"

testImplementation platform('org.junit:junit-bom:5.8.+')
testImplementation 'org.assertj:assertj-core:3.23.+'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "1.8"
}
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
}

test {
useJUnitPlatform()
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}
}

subprojects {
Expand Down
37 changes: 23 additions & 14 deletions dependencies.lock
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@
{
"apiDependenciesMetadata": {
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"compileClasspath": {
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"implementationDependenciesMetadata": {
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinCompilerClasspath": {
"org.jetbrains.kotlin:kotlin-compiler-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinCompilerPluginClasspathMain": {
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinCompilerPluginClasspathTest": {
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinKlibCommonizerClasspath": {
"org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"runtimeClasspath": {
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"testCompileClasspath": {
"org.assertj:assertj-core": {
"locked": "3.22.0"
"locked": "3.23.1"
},
"org.jetbrains.kotlin:kotlin-compiler": {
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.8.2"
Expand All @@ -58,10 +61,13 @@
},
"testImplementationDependenciesMetadata": {
"org.assertj:assertj-core": {
"locked": "3.22.0"
"locked": "3.23.1"
},
"org.jetbrains.kotlin:kotlin-compiler": {
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.8.2"
Expand All @@ -75,10 +81,13 @@
},
"testRuntimeClasspath": {
"org.assertj:assertj-core": {
"locked": "3.22.0"
"locked": "3.23.1"
},
"org.jetbrains.kotlin:kotlin-compiler": {
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.8.2"
Expand Down
85 changes: 47 additions & 38 deletions graphql-dgs-codegen-client-core/dependencies.lock
View file
Original file line number Diff line number Diff line change
@@ -1,106 +1,109 @@
{
"apiDependenciesMetadata": {
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"compileClasspath": {
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.13.2"
},
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"compileOnlyDependenciesMetadata": {
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.13.2"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
}
},
"implementationDependenciesMetadata": {
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinCompilerClasspath": {
"org.jetbrains.kotlin:kotlin-compiler-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinCompilerPluginClasspathMain": {
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinCompilerPluginClasspathTest": {
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"kotlinKlibCommonizerClasspath": {
"org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"runtimeClasspath": {
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
}
},
"testCompileClasspath": {
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-extended-scalars": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.assertj:assertj-core": {
"locked": "3.22.0"
"locked": "3.23.1"
},
"org.jetbrains.kotlin:kotlin-compiler": {
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.8.2"
Expand All @@ -114,22 +117,25 @@
},
"testImplementationDependenciesMetadata": {
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-extended-scalars": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.assertj:assertj-core": {
"locked": "3.22.0"
"locked": "3.23.1"
},
"org.jetbrains.kotlin:kotlin-compiler": {
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.8.2"
Expand All @@ -143,22 +149,25 @@
},
"testRuntimeClasspath": {
"com.graphql-java:graphql-java": {
"locked": "18.0"
"locked": "18.1"
},
"com.netflix.graphql.dgs:graphql-dgs-extended-scalars": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"com.netflix.graphql.dgs:graphql-dgs-platform-dependencies": {
"locked": "4.10.1"
"locked": "5.0.4"
},
"org.assertj:assertj-core": {
"locked": "3.22.0"
"locked": "3.23.1"
},
"org.jetbrains.kotlin:kotlin-compiler": {
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
"locked": "1.6.21"
"locked": "1.7.0"
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.8.2"
Expand Down
Loading

0 comments on commit ee0011f

Please sign in to comment.