Set apiVersion and languageVersion to 2.0 for backwards compatibility

Author: Hugo Costa

okio-testing-support/src/nonWasmMain/kotlin/okio/TestingNonWasm.kt

@@ -17,9 +17,9 @@ package okio
 
 import okio.fakefilesystem.FakeFileSystem
 
-actual typealias Clock = kotlin.time.Clock
+actual typealias Clock = kotlinx.datetime.Clock
 
-actual typealias Instant = kotlin.time.Instant
+actual typealias Instant = kotlinx.datetime.Instant
 
 actual fun fromEpochSeconds(
   epochSeconds: Long,

okio/build.gradle.kts

@@ -3,6 +3,7 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import kotlinx.validation.ApiValidationExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
@@ -54,6 +55,15 @@ plugins {
 kotlin {
   configureOrCreateOkioPlatforms()
 
+  targets.all {
+    compilations.all {
+      compilerOptions.configure {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+      }
+    }
+  }
+
   sourceSets {
     all {
       languageSettings.apply {

okio/src/jvmTest/kotlin/okio/FileHandleFileSystemTest.kt

@@ -18,7 +18,7 @@ package okio
 import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
 import java.nio.file.FileSystems
-import kotlin.time.Clock
+import kotlinx.datetime.Clock
 import okio.FileHandleFileSystemTest.FileHandleTestingFileSystem
 import okio.FileSystem.Companion.asOkioFileSystem
 

okio/src/jvmTest/kotlin/okio/JvmSystemFileSystemTest.kt

@@ -22,7 +22,7 @@ import java.nio.file.FileSystems
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.fail
-import kotlin.time.Clock
+import kotlinx.datetime.Clock
 import okio.FileSystem.Companion.asOkioFileSystem
 import org.junit.Test
 

okio/src/nativeTest/kotlin/okio/NativeSystemFileSystemTest.kt

@@ -15,7 +15,7 @@
  */
 package okio
 
-import kotlin.time.Clock
+import kotlinx.datetime.Clock
 
 class NativeSystemFileSystemTest : AbstractFileSystemTest(
   clock = Clock.System,

okio/src/nonWasmTest/kotlin/okio/FakeFileSystemTest.kt

@@ -27,23 +27,23 @@ import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
 
 class FakeWindowsFileSystemTest private constructor(clock: FakeClock) : FakeFileSystemTest(
-  fakeFileSystem = FakeFileSystem(clock = clock).also { it.emulateWindows() },
+  fakeFileSystem = FakeFileSystem().also { it.emulateWindows() },
   fakeClock = clock,
   temporaryDirectory = "C:\\".toPath(),
 ) {
   constructor() : this(FakeClock())
 }
 
 class FakeUnixFileSystemTest private constructor(clock: FakeClock) : FakeFileSystemTest(
-  fakeFileSystem = FakeFileSystem(clock = clock).also { it.emulateUnix() },
+  fakeFileSystem = FakeFileSystem().also { it.emulateUnix() },
   fakeClock = clock,
   temporaryDirectory = "/".toPath(),
 ) {
   constructor() : this(FakeClock())
 }
 
 class StrictFakeFileSystemTest private constructor(clock: FakeClock) : FakeFileSystemTest(
-  fakeFileSystem = FakeFileSystem(clock = clock),
+  fakeFileSystem = FakeFileSystem(),
   fakeClock = clock,
   temporaryDirectory = "/".toPath(),
 ) {
@@ -55,7 +55,9 @@ abstract class FakeFileSystemTest internal constructor(
   private val fakeClock: FakeClock,
   temporaryDirectory: Path,
 ) : AbstractFileSystemTest(
-  clock = fakeFileSystem.clock,
+  clock = object : kotlinx.datetime.Clock {
+    override fun now() = kotlinx.datetime.Instant.fromEpochMilliseconds(fakeFileSystem.clock.now().toEpochMilliseconds())
+  },
   fileSystem = fakeFileSystem,
   windowsLimitations = !fakeFileSystem.allowMovingOpenFiles,
   allowClobberingEmptyDirectories = fakeFileSystem.allowClobberingEmptyDirectories,

okio/src/nonWasmTest/kotlin/okio/ForwardingFileSystemTest.kt

@@ -19,7 +19,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
-import kotlin.time.Clock
+import kotlinx.datetime.Clock
 import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
 

okio/src/nonWasmTest/kotlin/okio/UseTest.kt

@@ -6,7 +6,7 @@ import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
 
 class UseTest {
-  val fakeFileSystem = FakeFileSystem(clock = FakeClock()).also { it.emulateUnix() }
+  val fakeFileSystem = FakeFileSystem().also { it.emulateUnix() }
 
   val base = "/cache".toPath().also {
     fakeFileSystem.createDirectories(it)

okio/src/zlibTest/kotlin/okio/ZipFileSystemGoTest.kt

@@ -17,7 +17,7 @@ package okio
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.time.Instant
+import kotlinx.datetime.Instant
 import okio.Path.Companion.toPath
 
 /**

okio/src/zlibTest/kotlin/okio/ZipFileSystemTest.kt

@@ -28,7 +28,7 @@ import assertk.assertions.isNull
 import assertk.assertions.isTrue
 import kotlin.test.Test
 import kotlin.test.assertFailsWith
-import kotlin.time.Instant
+import kotlinx.datetime.Instant
 import okio.ByteString.Companion.encodeUtf8
 import okio.Path.Companion.toPath