Bump dependency versions and set jvmTarget to 14
This commit is contained in:
parent
ff72990088
commit
d387842f95
8 changed files with 28 additions and 49 deletions
|
@ -1,5 +1,3 @@
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
kotlin("kapt")
|
kotlin("kapt")
|
||||||
|
@ -13,6 +11,7 @@ repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val kotlinVersion = properties["version.kotlin"].toString()
|
||||||
val spekVersion = properties["version.spek"].toString()
|
val spekVersion = properties["version.spek"].toString()
|
||||||
val moshiVersion = properties["version.moshi"].toString()
|
val moshiVersion = properties["version.moshi"].toString()
|
||||||
val coroutinesVersion = properties["version.kotlinx-coroutines"].toString()
|
val coroutinesVersion = properties["version.kotlinx-coroutines"].toString()
|
||||||
|
@ -22,7 +21,7 @@ val striktVersion = properties["version.strikt"].toString()
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Kotlin
|
// 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}")
|
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}")
|
||||||
|
|
||||||
// JSON
|
// JSON
|
||||||
|
@ -47,7 +46,6 @@ kotlin {
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
kotlinOptions.freeCompilerArgs = listOf(
|
kotlinOptions.freeCompilerArgs = listOf(
|
||||||
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
||||||
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
|
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
|
||||||
|
@ -55,12 +53,7 @@ tasks {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
compileTestKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val compileKotlin: KotlinCompile by tasks
|
|
||||||
|
|
|
@ -25,14 +25,6 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
compileTestKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,14 +27,6 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
compileTestKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,9 +12,3 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
api(project(":blokk-api"))
|
api(project(":blokk-api"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
kotlin("kapt")
|
kotlin("kapt")
|
||||||
id("com.github.johnrengelman.shadow") version "6.0.0"
|
id("com.github.johnrengelman.shadow") version "6.1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = rootProject.group
|
group = rootProject.group
|
||||||
|
@ -42,15 +42,14 @@ dependencies {
|
||||||
implementation("io.netty:netty-transport-native-kqueue:${nettyVersion}")
|
implementation("io.netty:netty-transport-native-kqueue:${nettyVersion}")
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
implementation("com.squareup.okhttp3:okhttp:4.8.1")
|
implementation("com.squareup.okhttp3:okhttp:4.9.0")
|
||||||
implementation("com.sksamuel.hoplite:hoplite-core:1.3.3")
|
implementation("com.sksamuel.hoplite:hoplite-core:1.3.9")
|
||||||
implementation("com.sksamuel.hoplite:hoplite-yaml:1.3.3")
|
implementation("com.sksamuel.hoplite:hoplite-yaml:1.3.9")
|
||||||
kapt("com.squareup.moshi:moshi-kotlin-codegen:${moshiVersion}")
|
kapt("com.squareup.moshi:moshi-kotlin-codegen:${moshiVersion}")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = "1.8"
|
|
||||||
kotlinOptions.freeCompilerArgs = listOf(
|
kotlinOptions.freeCompilerArgs = listOf(
|
||||||
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
||||||
"-progressive"
|
"-progressive"
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
// TODO: Update to 1.4.2
|
kotlin("jvm") version "1.4.20"
|
||||||
kotlin("jvm") version "1.4.0"
|
kotlin("kapt") version "1.4.20-RC"
|
||||||
kotlin("kapt") version "1.4.0"
|
|
||||||
id("minecraft-data-sources")
|
id("minecraft-data-sources")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,3 +12,9 @@ version = "0.0.1-SNAPSHOT"
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
tasks.withType<KotlinCompile> {
|
||||||
|
kotlinOptions.jvmTarget = "14"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
plugins {
|
plugins {
|
||||||
`java-gradle-plugin`
|
`java-gradle-plugin`
|
||||||
kotlin("jvm") version "1.4.0"
|
kotlin("jvm") version "1.4.20"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -8,10 +8,12 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.20")
|
||||||
|
|
||||||
implementation("com.squareup.okhttp3:okhttp:4.9.0")
|
implementation("com.squareup.okhttp3:okhttp:4.9.0")
|
||||||
implementation("com.jsoniter:jsoniter:0.9.19")
|
implementation("com.jsoniter:jsoniter:0.9.23")
|
||||||
implementation("com.squareup:kotlinpoet:1.6.0")
|
implementation("com.squareup:kotlinpoet:1.7.2")
|
||||||
implementation("com.google.guava:guava:29.0-jre")
|
implementation("com.google.guava:guava:30.0-jre")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
version.spek=2.0.12
|
version.kotlin=1.4.20
|
||||||
version.netty=4.1.50.Final
|
version.netty=4.1.54.Final
|
||||||
version.moshi=1.9.3
|
version.moshi=1.11.0
|
||||||
version.kotlinx-coroutines=1.3.8
|
version.kotlinx-coroutines=1.4.2
|
||||||
version.slf4j=1.7.30
|
version.slf4j=1.7.30
|
||||||
version.junit=5.6.2
|
version.junit=5.7.0
|
||||||
version.strikt=0.26.1
|
version.strikt=0.28.0
|
||||||
|
|
Reference in a new issue