upgrade: Kotlin 1.6.21

Signed-off-by: SlashNephy <spica@starry.blue>
StarryBlueSky · May 5, 2022 · 2ca88dd · 2ca88dd
1 parent 47c2476
commit 2ca88dd
Show file tree

Hide file tree

Showing 7 changed files with 2,693 additions and 19 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -3,8 +3,6 @@ name: Check
 on:
   push:
     paths-ignore:
-      - .gitignore
-      - LICENSE
       - '**.md'
     branches-ignore:
       - 'releases/**'
@@ -34,9 +32,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: 8
 
       - name: Grant Execute Permission to gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,9 +20,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: 8
 
       - name: Grant Execute Permission to gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -22,9 +22,10 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: 8
 
       - name: Grant Execute Permission to gradlew
         run: chmod +x gradlew

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,11 @@
 import blue.starry.scriptextender.EnvReference
 
 plugins {
-    kotlin("multiplatform") version "1.6.10"
+    kotlin("multiplatform") version "1.6.21"
     `maven-publish`
     signing
     id("io.codearte.nexus-staging") version "0.30.0"
-    id("org.jetbrains.dokka") version "1.6.10"
+    id("org.jetbrains.dokka") version "1.6.21"
     id("blue.starry.scriptextender") version "0.0.2"
 }
 
@@ -65,9 +65,7 @@ kotlin {
         nodejs()
         browser {
             testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
+                enabled = false
             }
         }
     }
@@ -94,7 +92,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
 
-                implementation("ch.qos.logback:logback-classic:1.3.0-alpha12")
+                implementation("ch.qos.logback:logback-classic:1.2.11")
             }
         }
 
@@ -112,7 +110,6 @@ kotlin {
             kotlinOptions {
                 apiVersion = "1.6"
                 languageVersion = "1.6"
-                allWarningsAsErrors = true
                 verbose = true
             }
         }
@@ -122,8 +119,7 @@ kotlin {
         languageSettings {
             progressiveMode = true
 
-            optIn("kotlin.Experimental")
-            optIn("kotlin.contracts.ExperimentalContracts")
+            optIn("kotlin.RequiresOptIn")
         }
     }
 }
@@ -217,7 +213,6 @@ signing {
     sign(publishing.publications)
 
     if (Env.SigningKey.isPresent) {
-        @Suppress("UnstableApiUsage")
         useInMemoryPgpKeys(
             Env.SigningKeyId.value,
             Env.SigningKey.value,

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,6 @@ kotlin.code.style=official
 
 kotlin.mpp.stability.nowarn=true
 
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.ignoreDisabledTargets=true
 
 # workaround for https://github.com/gradle/gradle/issues/11412