From 9711c5eb3e96fbb673cc09e942fc9196577e5628 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Thu, 18 Nov 2021 03:05:49 +0000
Subject: [PATCH] Upgrade buildscript for Kotlin 1.6.0, use Gradle 7.2
---
buildSrc/src/main/kotlin/Versions.kt | 14 +++++++-------
gradle.properties | 4 ++--
tools/gradle-plugin/build.gradle.kts | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index a7c810f98..1ef8b3d93 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -15,20 +15,20 @@ import org.gradle.kotlin.dsl.*
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
object Versions {
- const val project = "2.8.0-M1"
+ const val project = "2.9.0-M1"
- const val core = "2.7.0"
+ const val core = "2.8.0"
const val console = project
const val consoleTerminal = project
- const val kotlinCompiler = "1.5.30"
- const val kotlinStdlib = "1.5.30"
+ const val kotlinCompiler = "1.6.0"
+ const val kotlinStdlib = "1.6.0"
const val dokka = "1.4.32"
- const val coroutines = "1.5.1"
- const val atomicFU = "0.16.3"
+ const val coroutines = "1.5.2"
+ const val atomicFU = "0.17.0"
const val serialization = "1.2.2"
- const val ktor = "1.5.4"
+ const val ktor = "1.6.5"
const val binaryValidator = "0.4.0"
diff --git a/gradle.properties b/gradle.properties
index fc7aa04f8..b01cc3e92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,5 +9,5 @@
# style guide
kotlin.code.style=official
org.gradle.vfs.watch=true
-kotlin.parallel.tasks.in.project=true
-org.gradle.parallel=true
\ No newline at end of file
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 --illegal-access=permit -Dkotlin.daemon.jvm.options=--illegal-access=permit --add-opens java.base/java.util=ALL-UNNAMED
\ No newline at end of file
diff --git a/tools/gradle-plugin/build.gradle.kts b/tools/gradle-plugin/build.gradle.kts
index 8b175ae92..34151e53a 100644
--- a/tools/gradle-plugin/build.gradle.kts
+++ b/tools/gradle-plugin/build.gradle.kts
@@ -90,7 +90,7 @@ gradlePlugin {
kotlin.target.compilations.all {
kotlinOptions {
apiVersion = "1.3"
- languageVersion = "1.3"
+ languageVersion = "1.4"
}
}