Upgraded kotlin to 1.9.20 (#556)

- upgraded kotlin
- removed actual\expected class
- added required OptIn
- removed `nonJs` target

Author: nulls

buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/kotlin-library.gradle.kts

@@ -31,16 +31,6 @@ kotlin {
         macosX64(),
         /* macosArm64() */
     )
-    if (project.name == "save-common") {
-        // additionally, save-common should be available for JS too
-        // fixme: shouldn't rely on hardcoded project name here
-        js(IR).browser()
-
-        // store yarn.lock in the root directory
-        rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> {
-            lockFileDirectory = rootProject.projectDir
-        }
-    }
 
     if (hasProperty("disableRedundantTargets") && (property("disableRedundantTargets") as String?) != "false") {
         // with this flag we exclude targets that are present on multiple OS to speed up build
@@ -58,55 +48,20 @@ kotlin {
             }
     }
 
-    /*
-     * Common structure for MPP libraries:
-     *            common
-     *              |
-     *            nonJs
-     *          /       \
-     *       native      JVM
-     *     /   |    \
-     * linux  mingw macos
-     */
     sourceSets {
-        val commonMain by getting
         val commonTest by getting {
             dependencies {
                 implementation("io.kotest:kotest-assertions-core:5.8.0")
-            }
-        }
-        val commonNonJsMain by creating {
-            dependsOn(commonMain)
-        }
-        val commonNonJsTest by creating {
-            dependsOn(commonTest)
-            dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
             }
         }
-        val jvmMain by getting {
-            dependsOn(commonNonJsMain)
-        }
         val jvmTest by getting {
-            dependsOn(commonNonJsTest)
             dependencies {
                 implementation(kotlin("test-junit5"))
                 implementation("org.junit.jupiter:junit-jupiter-engine:5.10.1")
             }
         }
-        val nativeMain by creating {
-            dependsOn(commonNonJsMain)
-        }
-        val nativeTest by creating {
-            dependsOn(commonNonJsTest)
-        }
-        nativeTargets.forEach {
-            getByName("${it.name}Main").dependsOn(nativeMain)
-        }
-        nativeTargets.forEach {
-            getByName("${it.name}Test").dependsOn(nativeTest)
-        }
     }
 }
 

diktat-analysis.yml

@@ -3,8 +3,8 @@
   configuration:
     domainName: com.saveourtool.save
     kotlinVersion: 1.6
-    srcDirectories: "main,nativeMain,commonNonJsMain"
-    testDirs: "test,nativeTest,commonTest,jvmTest,commonNonJsTest"
+    srcDirectories: "main,nativeMain,commonMain"
+    testDirs: "test,nativeTest,commonTest,jvmTest,commonTest"
 - name: AVOID_NULL_CHECKS
   enabled: false
 - name: ENUM_VALUE

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 okio = "3.6.0"
 serialization = "1.6.0"
 diktat = "1.2.5"

save-cli/build.gradle.kts

@@ -18,11 +18,6 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(libs.okio)
-            }
-        }
-
-        val commonNonJsMain by getting {
-            dependencies {
                 implementation(projects.saveCore)
                 implementation(projects.saveCommon)
                 implementation(libs.kotlinx.serialization.properties)

save-cli/src/commonNonJsMain/kotlin/com/saveourtool/save/cli/ExitCodes.kt renamed to save-cli/src/commonMain/kotlin/com/saveourtool/save/cli/ExitCodes.kt

@@ -7,18 +7,17 @@ package com.saveourtool.save.cli.logging
 import com.saveourtool.save.cli.ExitCodes
 
 /**
- * Log [message] with level ERROR and exit process with code [exitCode]
+ * Log result of [messageSupplier] with level WARN
  *
- * @param exitCode exit code
- * @param message message to log
- * @return nothing, program terminates in this method
+ * @param messageSupplier supplier for message to log
  */
-@Deprecated("never use this method in save-core as it can lead to a break of save-cloud application")
-expect fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing
+expect fun logWarn(messageSupplier: () -> String): Unit
 
 /**
- * Log result of [messageSupplier] with level WARN
+ * Log [message] with level ERROR and exit process with code [exitCode]
  *
- * @param messageSupplier supplier for message to log
+ * @param exitCode exit code
+ * @param message message to log
+ * @return nothing, program terminates in this method
  */
-expect fun logWarn(messageSupplier: () -> String): Unit
+internal expect fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing

save-cli/src/commonNonJsMain/kotlin/com/saveourtool/save/cli/SaveCliRunner.kt renamed to save-cli/src/commonMain/kotlin/com/saveourtool/save/cli/SaveCliRunner.kt

@@ -9,11 +9,11 @@ import com.saveourtool.save.core.logging.logError
 import com.saveourtool.save.core.logging.logWarn
 import kotlin.system.exitProcess
 
-actual fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing {
-    logError(message)
-    exitProcess(exitCode.code)
-}
-
 actual fun logWarn(messageSupplier: () -> String) {
     logWarn(messageSupplier())
 }
+
+internal actual fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing {
+    logError(message)
+    exitProcess(exitCode.code)
+}

save-cli/src/commonNonJsMain/kotlin/com/saveourtool/save/cli/config/SavePropertiesExt.kt renamed to save-cli/src/commonMain/kotlin/com/saveourtool/save/cli/config/SavePropertiesExt.kt

@@ -9,11 +9,11 @@ import com.saveourtool.save.core.logging.logError
 import com.saveourtool.save.core.logging.logWarn
 import kotlin.system.exitProcess
 
-actual fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing {
-    logError(message)
-    exitProcess(exitCode.code)
-}
-
 actual fun logWarn(messageSupplier: () -> String) {
     logWarn(messageSupplier())
 }
+
+internal actual fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing {
+    logError(message)
+    exitProcess(exitCode.code)
+}