Upgraded kotlin to 1.9.20

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/logging/Logger.kt → save-cli/src/commonMain/kotlin/com/saveourtool/save/cli/logging/Logger.kt

@@ -13,8 +13,7 @@ import com.saveourtool.save.cli.ExitCodes
  * @param message message to log
  * @return nothing, program terminates in this method
  */
-@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
+internal expect fun logErrorAndExit(exitCode: ExitCodes, message: String): Nothing
 
 /**
  * Log result of [messageSupplier] with level WARN

save-cli/src/jvmMain/kotlin/com/saveourtool/save/cli/logging/Logger.kt

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

save-cli/src/nativeMain/kotlin/com/saveourtool/save/cli/logging/Logger.kt

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

save-common-test/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 kotlin {
  sourceSets {
- val commonNonJsMain by getting {
+ val commonMain by getting {
  dependencies {
  implementation(projects.saveCommon)
  api(libs.okio)

save-common-test/src/commonNonJsMain/kotlin/com/saveourtool/save/Utils.kt → save-common-test/src/commonMain/kotlin/com/saveourtool/save/Utils.kt

@@ -10,16 +10,6 @@ import okio.FileSystem
 import okio.Path
 import kotlin.random.Random
 
-/**
- * Marks method to be executed before all tests, supported on JVM and Native
- */
-expect annotation class BeforeClass
-
-/**
- * Marks method to be executed after all tests, supported on JVM and Native
- */
-expect annotation class AfterClass
-
 /**
  * Create a temporary directory
  *

save-common/build.gradle.kts

@@ -3,6 +3,20 @@ plugins {
 }
 
 kotlin {
+ js(IR) {
+ browser()
+ testRuns.configureEach {
+ filter {
+ setExcludePatterns("*")
+ }
+ }
+ }
+
+ // store yarn.lock in the root directory
+ rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> {
+ lockFileDirectory = rootProject.projectDir
+ }
+
  sourceSets {
  val commonMain by getting {
  dependencies {

save-common/src/commonMain/kotlin/com/saveourtool/save/core/logging/Logger.kt

@@ -10,18 +10,17 @@ package com.saveourtool.save.core.logging
 import com.saveourtool.save.core.config.LogType
 import com.saveourtool.save.core.config.OutputStreamType
 import com.saveourtool.save.core.utils.GenericAtomicReference
+import com.saveourtool.save.core.utils.createGenericAtomicReference
 import com.saveourtool.save.core.utils.writeToStream
 
-import kotlin.native.concurrent.SharedImmutable
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 
 /**
  * Logging mode
  */
-@SharedImmutable
-val logType: GenericAtomicReference<LogType> = GenericAtomicReference(LogType.WARN)
+val logType: GenericAtomicReference<LogType> = createGenericAtomicReference(LogType.WARN)
 
 /**
  * Whether to add time stamps to log messages

save-common/src/commonMain/kotlin/com/saveourtool/save/core/utils/PlatformUtils.kt

@@ -16,12 +16,10 @@ enum class CurrentOs {
 }
 
 /**
- *  Class that holds value and shares atomic reference to the value (native only)
+ * Interface that holds value and shares atomic reference to the value (native only)
  *
- * @param valueToStore value to store
  */
-@Suppress("USE_DATA_CLASS")
-expect class GenericAtomicReference<T>(valueToStore: T) {
+interface GenericAtomicReference<T> {
  /**
  * @return stored value
  */
@@ -33,6 +31,12 @@ expect class GenericAtomicReference<T>(valueToStore: T) {
  fun set(newValue: T)
 }
 
+/**
+ * @param valueToStore value to store
+ * @return a new [GenericAtomicReference] with default value [valueToStore]
+ */
+expect fun <T> createGenericAtomicReference(valueToStore: T): GenericAtomicReference<T>
+
 /**
  * Get type of current OS
  *

save-common/src/commonMain/kotlin/com/saveourtool/save/core/utils/ProcessBuilder.kt

@@ -19,13 +19,9 @@ import okio.Path.Companion.toPath
 import kotlinx.datetime.Clock
 
 /**
- * A class that is capable of executing processes, specific to different OS and returning their output.
+ * An interface that is capable of executing processes, specific to different OS and returning their output.
  */
-expect class ProcessBuilderInternal(
- stdoutFile: Path,
- stderrFile: Path,
- useInternalRedirections: Boolean,
-) {
+interface ProcessBuilderInternal {
  /**
  * Modify execution command according behavior of different OS,
  * also stdout and stderr will be redirected to tmp files
@@ -97,7 +93,7 @@ class ProcessBuilder(private val useInternalRedirections: Boolean, private val f
  val stderrFile = tmpDir / "stderr.txt"
  logTrace("Creating stderr file of ProcessBuilder: $stderrFile")
  // Instance, containing platform-dependent realization of command execution
- val processBuilderInternal = ProcessBuilderInternal(stdoutFile, stderrFile, useInternalRedirections)
+ val processBuilderInternal = createProcessBuilderInternal(stdoutFile, stderrFile, useInternalRedirections)
  fs.createDirectories(tmpDir)
  fs.createFile(stdoutFile)
  fs.createFile(stderrFile)
@@ -236,3 +232,15 @@ data class ExecutionResult(
  val stdout: List<String>,
  val stderr: List<String>,
 )
+
+/**
+ * @param stdoutFile
+ * @param stderrFile
+ * @param useInternalRedirections
+ * @return implementation of [ProcessBuilderInternal]
+ */
+expect fun createProcessBuilderInternal(
+ stdoutFile: Path,
+ stderrFile: Path,
+ useInternalRedirections: Boolean,
+): ProcessBuilderInternal

save-common/src/commonNonJsTest/kotlin/com/saveourtool/save/core/ExtraFlagsExtractorTest.kt → save-common/src/commonTest/kotlin/com/saveourtool/save/core/ExtraFlagsExtractorTest.kt

@@ -8,6 +8,7 @@ import com.saveourtool.save.core.plugin.resolvePlaceholdersFrom
 import com.saveourtool.save.core.plugin.splitByNonEscaped
 
 import okio.fakefilesystem.FakeFileSystem
+import kotlin.js.JsName
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -18,6 +19,7 @@ import kotlin.test.assertEquals
 )
 class ExtraFlagsExtractorTest {
  @Test
+ @JsName("basic_test")
  fun `basic test`() {
  val extraFlagsExtractor = ExtraFlagsExtractor(
  GeneralConfig(runConfigPattern = Regex("""// RUN: (.*[^\\]=.*)""")),
@@ -41,6 +43,7 @@ class ExtraFlagsExtractorTest {
  }
 
  @Test
+ @JsName("should_resolve_placeholders")
  fun `should resolve placeholders`() {
  // basic test
  checkPlaceholders(
@@ -80,6 +83,7 @@ class ExtraFlagsExtractorTest {
  }
 
  @Test
+ @JsName("should_join_multiline_directives")
  fun `should join multiline directives`() {
  checkMultilineDirectives(
  Regex("""// RUN: (.*([^\\]=)?.*)\\?"""),
@@ -130,6 +134,7 @@ class ExtraFlagsExtractorTest {
  }
 
  @Test
+ @JsName("test_for_splitByNonEscaped")
  fun `test for splitByNonEscaped`() {
  assertEquals(
  listOf("this string\\, not split"),