diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 01c36646..d3e84bcf 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -12,11 +12,11 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Publish uses: eskatos/gradle-command-action@v1 with: - gradle-version: 7.0.2 + gradle-version: 7.5.1 arguments: publish env: sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 543d7fd4..4345b292 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Run Tests uses: eskatos/gradle-command-action@v1 with: diff --git a/gradle.properties b/gradle.properties index 0992678c..b00b4f4e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,19 +2,19 @@ version=0.18.0 # Dependencies -coroutine_version=1.6.1 -jackson_version=2.12.3 -caffeine_version=3.0.2 -serialization_version=1.3.1 -kDataLoader_version=0.4.0 +coroutine_version=1.6.4 +jackson_version=2.13.4 +caffeine_version=3.1.1 +serialization_version=1.4.0 +kDataLoader_version=0.5.1 deferredJsonBuilder_version=1.0.0 -ktor_version=2.0.0 +ktor_version=2.1.2 # Test-Dependencies -kotlin_html_version=0.6.12 -netty_version=4.1.42.Final -junit_version=5.7.2 -kluent_version=1.65 +kotlin_html_version=0.7.5 +netty_version=4.1.82.Final +junit_version=5.9.0 +kluent_version=1.68 hamcrest_version=2.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29e41345..8fad3f5a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kgraphql-example/build.gradle.kts b/kgraphql-example/build.gradle.kts index 8e3fba3d..0ca5f7fe 100644 --- a/kgraphql-example/build.gradle.kts +++ b/kgraphql-example/build.gradle.kts @@ -1,8 +1,8 @@ plugins { base application - kotlin("jvm") version "1.6.20" - id("org.jetbrains.dokka") version "1.4.32" + kotlin("jvm") version "1.7.10" + id("org.jetbrains.dokka") version "1.7.10" signing } @@ -17,7 +17,7 @@ val junit_version: String by project val isReleaseVersion = !version.toString().endsWith("SNAPSHOT") application { - mainClassName = "io.ktor.server.netty.EngineMain" + mainClass.set("io.ktor.server.netty.EngineMain") } dependencies { @@ -34,8 +34,8 @@ dependencies { tasks { - compileKotlin { kotlinOptions { jvmTarget = "1.8" } } - compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } } + compileKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } + compileTestKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } test { useJUnitPlatform() @@ -44,7 +44,7 @@ tasks { outputDirectory.set(buildDir.resolve("javadoc")) dokkaSourceSets { configureEach { - jdkVersion.set(8) + jdkVersion.set(11) reportUndocumented.set(true) platform.set(org.jetbrains.dokka.Platform.jvm) } diff --git a/kgraphql-ktor/build.gradle.kts b/kgraphql-ktor/build.gradle.kts index f10c3044..13b2b282 100644 --- a/kgraphql-ktor/build.gradle.kts +++ b/kgraphql-ktor/build.gradle.kts @@ -39,8 +39,8 @@ dependencies { tasks { - compileKotlin { kotlinOptions { jvmTarget = "1.8" } } - compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } } + compileKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } + compileTestKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } test { useJUnitPlatform() @@ -49,7 +49,7 @@ tasks { outputDirectory.set(buildDir.resolve("javadoc")) dokkaSourceSets { configureEach { - jdkVersion.set(8) + jdkVersion.set(11) reportUndocumented.set(true) platform.set(org.jetbrains.dokka.Platform.jvm) } diff --git a/kgraphql/build.gradle.kts b/kgraphql/build.gradle.kts index 408acd64..4ac86575 100644 --- a/kgraphql/build.gradle.kts +++ b/kgraphql/build.gradle.kts @@ -1,8 +1,8 @@ plugins { base - kotlin("jvm") version "1.6.20" - id("org.jetbrains.dokka") version "1.4.32" + kotlin("jvm") version "1.7.10" + id("org.jetbrains.dokka") version "1.7.10" signing } @@ -47,8 +47,8 @@ dependencies { } tasks { - compileKotlin { kotlinOptions { jvmTarget = "1.8" } } - compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } } + compileKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } + compileTestKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } test { useJUnitPlatform() @@ -57,7 +57,7 @@ tasks { outputDirectory.set(buildDir.resolve("javadoc")) dokkaSourceSets { configureEach { - jdkVersion.set(8) + jdkVersion.set(11) reportUndocumented.set(true) platform.set(org.jetbrains.dokka.Platform.jvm) } diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/DataLoader.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/DataLoader.kt index ba413fcc..190a582e 100644 --- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/DataLoader.kt +++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/DataLoader.kt @@ -57,14 +57,12 @@ fun CoroutineScope.dataActor(totalTimes: Int, batchLoader: suspend (List< } for (msg in channel) { - when (msg) { - is Add<*, *> -> { - msg as Add - if (!promiseMap.containsKey(msg.key)) promiseMap[msg.key] = Stack() - promiseMap[msg.key]?.add(msg.result) ?: throw TODO("Couldn't find any '${msg.key}' in map") - log("$counter") - if (--counter == 0) doJoin() - } + if (msg is Add<*, *>) { + msg as Add + if (!promiseMap.containsKey(msg.key)) promiseMap[msg.key] = Stack() + promiseMap[msg.key]?.add(msg.result) ?: throw TODO("Couldn't find any '${msg.key}' in map") + log("$counter") + if (--counter == 0) doJoin() } } }