Ver Fonte

Revert "Upgrade buildscript for Kotlin 1.6.0, use Gradle 7.2"

This reverts commit 9711c5eb3e96fbb673cc09e942fc9196577e5628.
Him188 há 4 anos atrás
pai
commit
735e31551a

+ 7 - 7
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.9.0-M1"
+    const val project = "2.8.0-M1"
 
-    const val core = "2.8.0"
+    const val core = "2.7.0"
     const val console = project
     const val consoleTerminal = project
 
-    const val kotlinCompiler = "1.6.0"
-    const val kotlinStdlib = "1.6.0"
+    const val kotlinCompiler = "1.5.30"
+    const val kotlinStdlib = "1.5.30"
     const val dokka = "1.4.32"
 
-    const val coroutines = "1.5.2"
-    const val atomicFU = "0.17.0"
+    const val coroutines = "1.5.1"
+    const val atomicFU = "0.16.3"
     const val serialization = "1.2.2"
-    const val ktor = "1.6.5"
+    const val ktor = "1.5.4"
 
     const val binaryValidator = "0.4.0"
 

+ 2 - 2
gradle.properties

@@ -9,5 +9,5 @@
 # style guide
 kotlin.code.style=official
 org.gradle.vfs.watch=true
-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
+kotlin.parallel.tasks.in.project=true
+org.gradle.parallel=true

+ 1 - 1
tools/gradle-plugin/build.gradle.kts

@@ -90,7 +90,7 @@ gradlePlugin {
 kotlin.target.compilations.all {
     kotlinOptions {
         apiVersion = "1.3"
-        languageVersion = "1.4"
+        languageVersion = "1.3"
     }
 }