moritzruth/uranos
Archived
1
0
Fork 0
Code Activity

Bump dependency versions and set jvmTarget to 14

Browse source
This commit is contained in:
Moritz Ruth 2020-11-30 10:37:33 +01:00
parent ff72990088
commit d387842f95
8 changed files with 28 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
blokk-api/build.gradle.kts
View file

@ -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

8
blokk-nbt/build.gradle.kts
View file

@ -25,14 +25,6 @@ dependencies {
}
tasks {
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
}
test {
useJUnitPlatform()
}

8
blokk-packet-codecs/build.gradle.kts
View file

@ -27,14 +27,6 @@ dependencies {
}
tasks {
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
}
test {
useJUnitPlatform()
}

6
blokk-packets/build.gradle.kts
View file

@ -12,9 +12,3 @@ repositories {
dependencies {
api(project(":blokk-api"))
}
tasks {
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
}

9
blokk-server/build.gradle.kts
View file

@ -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"

13
build.gradle.kts
View file

@ -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<KotlinCompile> {
kotlinOptions.jvmTarget = "14"
}
}

10
buildSrc/build.gradle.kts
View file

@ -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 {

12
gradle.properties
View file

@ -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