diff --git a/README.md b/README.md index 7ee64e1d..3c21a6c8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Whilst I try not to break API compatibility, but things could change at anytime! - See the [documentation](https://www.blueberrymc.net/reference/source-mod/) for more details and how to use it properly - [Mixin](https://github.com/SpongePowered/Mixin) support - File selection screen within the client (FileDialogScreen) -- Bundled Kotlin (v1.6.10) +- Bundled Kotlin (v1.7.0) ## ✏️ Translations All translation PRs are welcome! diff --git a/build.gradle.kts b/build.gradle.kts index 0751b424..3ff876b5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,11 @@ import net.blueberrymc.gradle.buildSrc.Util.getBuildNumber +import net.blueberrymc.gradle.buildSrc.constants.KOTLIN_VERSION import net.blueberrymc.gradle.buildSrc.constants.API_VERSION import net.blueberrymc.gradle.buildSrc.constants.MINECRAFT_VERSION plugins { java - kotlin("jvm") version "1.6.20" + kotlin("jvm") version net.blueberrymc.gradle.buildSrc.constants.KOTLIN_VERSION `maven-publish` `java-library` } @@ -58,7 +59,7 @@ subprojects { } dependencies { - implementation(kotlin("stdlib", "1.6.20")) + implementation(kotlin("stdlib", KOTLIN_VERSION)) } publishing { @@ -127,7 +128,7 @@ allprojects { subprojects { dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.10") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION") testImplementation("org.junit.jupiter:junit-jupiter:5.8.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fb591bac..db787cf6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.6.20" + kotlin("jvm") version "1.7.0" } repositories { @@ -9,7 +9,7 @@ repositories { } dependencies { - implementation(kotlin("stdlib", "1.6.20")) + implementation(kotlin("stdlib", "1.7.0")) implementation("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r") implementation("net.minecraftforge:forgeflower:1.5.498.29") implementation("net.minecraftforge:accesstransformers:8.0.4") @@ -18,3 +18,11 @@ dependencies { implementation("io.sigpipe:jbsdiff:1.0") implementation("net.blueberrymc:native-util:2.1.0") } + +tasks { + compileKotlin { + kotlinOptions { + jvmTarget = compileJava.get().targetCompatibility + } + } +} diff --git a/buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt b/buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt index f313736e..87a3aa09 100644 --- a/buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt +++ b/buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt @@ -11,7 +11,7 @@ const val CLIENT_JAR_URL = "https://piston-data.mojang.com/v1/objects/d1a0318001 const val SERVER_JAR_URL = "https://piston-data.mojang.com/v1/objects/71a6d4c634de517ab1b6c2db8b743cbc831d9794/server.jar" const val CLIENT_MAPPING_URL = "https://piston-data.mojang.com/v1/objects/f45b5b9218548772d45f4cb029d0249879895dfb/client.txt" const val MAPPING_VERSION = "22w05a" -const val KOTLIN_VERSION = "1.6.10" +const val KOTLIN_VERSION = "1.7.0" val SERVER_REPOSITORIES_LIST = listOf( "https://repo.blueberrymc.net/repository/maven-public/", diff --git a/scripts/files/version.json b/scripts/files/version.json index 1039293f..c5f02e28 100644 --- a/scripts/files/version.json +++ b/scripts/files/version.json @@ -1451,24 +1451,24 @@ { "downloads": { "artifact": { - "path": "org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.jar", - "sha1": "b8af3fe6f1ca88526914929add63cf5e7c5049af", - "size": 1508076, - "url": "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.jar" + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0.jar", + "sha1": "a5f42c684ad9003160ef0d0f693ecf0ba7b13549", + "size": 1524619, + "url": "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0.jar" } }, - "name": "org.jetbrains.kotlin:kotlin-stdlib:1.6.10" + "name": "org.jetbrains.kotlin:kotlin-stdlib:1.7.0" }, { "downloads": { "artifact": { - "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.jar", - "sha1": "0c118700e3a33c8a0d9adc920e9dec0831171925", - "size": 200617, - "url": "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.jar" + "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0.jar", + "sha1": "51736992f422993a1e741051bdf3c12801bc1ca1", + "size": 198935, + "url": "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0.jar" } }, - "name": "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" + "name": "org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0" } ], "minimumLauncherVersion": 21,