Skip to content

Commit 13399a2

Browse files
author
Hugo Costa
committed
Set apiVersion and languageVersion to 2.0 for backwards compatibility
1 parent 819b318 commit 13399a2

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

okio/build.gradle.kts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka
33
import com.vanniktech.maven.publish.KotlinMultiplatform
44
import com.vanniktech.maven.publish.MavenPublishBaseExtension
55
import kotlinx.validation.ApiValidationExtension
6+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
67
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
78
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
89
import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
@@ -54,6 +55,15 @@ plugins {
5455
kotlin {
5556
configureOrCreateOkioPlatforms()
5657

58+
targets.all {
59+
compilations.all {
60+
compilerOptions.configure {
61+
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
62+
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
63+
}
64+
}
65+
}
66+
5767
sourceSets {
5868
all {
5969
languageSettings.apply {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package okio
1717

18-
import kotlin.time.Clock
19-
2018
class NativeSystemFileSystemTest : AbstractFileSystemTest(
2119
clock = Clock.System,
2220
fileSystem = FileSystem.SYSTEM,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import kotlin.test.Test
1919
import kotlin.test.assertEquals
2020
import kotlin.test.assertFailsWith
2121
import kotlin.test.assertTrue
22-
import kotlin.time.Clock
2322
import okio.Path.Companion.toPath
2423
import okio.fakefilesystem.FakeFileSystem
2524

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package okio
1717

1818
import kotlin.test.Test
1919
import kotlin.test.assertEquals
20-
import kotlin.time.Instant
20+
import kotlinx.datetime.Instant
2121
import okio.Path.Companion.toPath
2222

2323
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import assertk.assertions.isNull
2828
import assertk.assertions.isTrue
2929
import kotlin.test.Test
3030
import kotlin.test.assertFailsWith
31-
import kotlin.time.Instant
31+
import kotlinx.datetime.Instant
3232
import okio.ByteString.Companion.encodeUtf8
3333
import okio.Path.Companion.toPath
3434

0 commit comments

Comments
 (0)