From d387842f95b0ebaa353a5318f572e4ca6b80a804 Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Mon, 30 Nov 2020 10:37:33 +0100 Subject: [PATCH] Bump dependency versions and set jvmTarget to 14 --- blokk-api/build.gradle.kts | 11 ++--------- blokk-nbt/build.gradle.kts | 8 -------- blokk-packet-codecs/build.gradle.kts | 8 -------- blokk-packets/build.gradle.kts | 6 ------ blokk-server/build.gradle.kts | 9 ++++----- build.gradle.kts | 13 ++++++++++--- buildSrc/build.gradle.kts | 10 ++++++---- gradle.properties | 12 ++++++------ 8 files changed, 28 insertions(+), 49 deletions(-) diff --git a/blokk-api/build.gradle.kts b/blokk-api/build.gradle.kts index 10d9633..35e1736 100644 --- a/blokk-api/build.gradle.kts +++ b/blokk-api/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { kotlin("jvm") kotlin("kapt") @@ -13,6 +11,7 @@ repositories { jcenter() } +val kotlinVersion = properties["version.kotlin"].toString() val spekVersion = properties["version.spek"].toString() val moshiVersion = properties["version.moshi"].toString() val coroutinesVersion = properties["version.kotlinx-coroutines"].toString() @@ -22,7 +21,7 @@ val striktVersion = properties["version.strikt"].toString() dependencies { // Kotlin - api("org.jetbrains.kotlin:kotlin-reflect:1.4.10") + api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") // JSON @@ -47,7 +46,6 @@ kotlin { tasks { compileKotlin { - kotlinOptions.jvmTarget = "1.8" kotlinOptions.freeCompilerArgs = listOf( "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-Xopt-in=kotlin.contracts.ExperimentalContracts", @@ -55,12 +53,7 @@ tasks { ) } - compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" - } - test { useJUnitPlatform() } } -val compileKotlin: KotlinCompile by tasks diff --git a/blokk-nbt/build.gradle.kts b/blokk-nbt/build.gradle.kts index 6d5ce1b..2c07e8b 100644 --- a/blokk-nbt/build.gradle.kts +++ b/blokk-nbt/build.gradle.kts @@ -25,14 +25,6 @@ dependencies { } tasks { - compileKotlin { - kotlinOptions.jvmTarget = "1.8" - } - - compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" - } - test { useJUnitPlatform() } diff --git a/blokk-packet-codecs/build.gradle.kts b/blokk-packet-codecs/build.gradle.kts index 301b44e..dd1267a 100644 --- a/blokk-packet-codecs/build.gradle.kts +++ b/blokk-packet-codecs/build.gradle.kts @@ -27,14 +27,6 @@ dependencies { } tasks { - compileKotlin { - kotlinOptions.jvmTarget = "1.8" - } - - compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" - } - test { useJUnitPlatform() } diff --git a/blokk-packets/build.gradle.kts b/blokk-packets/build.gradle.kts index 4216a94..e20797b 100644 --- a/blokk-packets/build.gradle.kts +++ b/blokk-packets/build.gradle.kts @@ -12,9 +12,3 @@ repositories { dependencies { api(project(":blokk-api")) } - -tasks { - compileKotlin { - kotlinOptions.jvmTarget = "1.8" - } -} diff --git a/blokk-server/build.gradle.kts b/blokk-server/build.gradle.kts index bd1bf36..3953e91 100644 --- a/blokk-server/build.gradle.kts +++ b/blokk-server/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("kapt") - id("com.github.johnrengelman.shadow") version "6.0.0" + id("com.github.johnrengelman.shadow") version "6.1.0" } group = rootProject.group @@ -42,15 +42,14 @@ dependencies { implementation("io.netty:netty-transport-native-kqueue:${nettyVersion}") // Other - implementation("com.squareup.okhttp3:okhttp:4.8.1") - implementation("com.sksamuel.hoplite:hoplite-core:1.3.3") - implementation("com.sksamuel.hoplite:hoplite-yaml:1.3.3") + implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.sksamuel.hoplite:hoplite-core:1.3.9") + implementation("com.sksamuel.hoplite:hoplite-yaml:1.3.9") kapt("com.squareup.moshi:moshi-kotlin-codegen:${moshiVersion}") } tasks { compileKotlin { - kotlinOptions.jvmTarget = "1.8" kotlinOptions.freeCompilerArgs = listOf( "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-progressive" diff --git a/build.gradle.kts b/build.gradle.kts index bad8531..0f87693 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,8 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { - // TODO: Update to 1.4.2 - kotlin("jvm") version "1.4.0" - kotlin("kapt") version "1.4.0" + kotlin("jvm") version "1.4.20" + kotlin("kapt") version "1.4.20-RC" id("minecraft-data-sources") } @@ -11,3 +12,9 @@ version = "0.0.1-SNAPSHOT" repositories { mavenCentral() } + +allprojects { + tasks.withType { + kotlinOptions.jvmTarget = "14" + } +} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5f4095e..0c6215b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `java-gradle-plugin` - kotlin("jvm") version "1.4.0" + kotlin("jvm") version "1.4.20" } repositories { @@ -8,10 +8,12 @@ repositories { } dependencies { + implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.20") + implementation("com.squareup.okhttp3:okhttp:4.9.0") - implementation("com.jsoniter:jsoniter:0.9.19") - implementation("com.squareup:kotlinpoet:1.6.0") - implementation("com.google.guava:guava:29.0-jre") + implementation("com.jsoniter:jsoniter:0.9.23") + implementation("com.squareup:kotlinpoet:1.7.2") + implementation("com.google.guava:guava:30.0-jre") } tasks { diff --git a/gradle.properties b/gradle.properties index a5d7b1b..bf66016 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ kotlin.code.style=official -version.spek=2.0.12 -version.netty=4.1.50.Final -version.moshi=1.9.3 -version.kotlinx-coroutines=1.3.8 +version.kotlin=1.4.20 +version.netty=4.1.54.Final +version.moshi=1.11.0 +version.kotlinx-coroutines=1.4.2 version.slf4j=1.7.30 -version.junit=5.6.2 -version.strikt=0.26.1 +version.junit=5.7.0 +version.strikt=0.28.0