diff --git a/components/gradle.properties b/components/gradle.properties index eade84d7b8..7c56aa1e15 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -3,7 +3,7 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official # __KOTLIN_COMPOSE_VERSION__ -kotlin.version=1.9.0 +kotlin.version=1.8.22 # __LATEST_COMPOSE_RELEASE_VERSION__ compose.version=1.5.0-dev1112 agp.version=7.3.1 diff --git a/components/resources/library/build.gradle.kts b/components/resources/library/build.gradle.kts index f40f7b7804..3bff485c99 100644 --- a/components/resources/library/build.gradle.kts +++ b/components/resources/library/build.gradle.kts @@ -63,7 +63,7 @@ kotlin { dependsOn(jvmAndAndroidMain) dependsOn(commonButJSMain) } - val androidUnitTest by getting { + val androidTest by getting { dependencies { } diff --git a/components/resources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/Resource.ios.kt b/components/resources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/Resource.ios.kt index fda8a5ddb7..9d9be82c9a 100644 --- a/components/resources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/Resource.ios.kt +++ b/components/resources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/Resource.ios.kt @@ -5,7 +5,6 @@ package org.jetbrains.compose.resources -import kotlinx.cinterop.ExperimentalForeignApi import kotlinx.cinterop.addressOf import kotlinx.cinterop.usePinned import platform.Foundation.NSBundle @@ -18,7 +17,6 @@ actual fun resource(path: String): Resource = UIKitResourceImpl(path) @ExperimentalResourceApi private class UIKitResourceImpl(path: String) : AbstractResourceImpl(path) { - @OptIn(ExperimentalForeignApi::class) override suspend fun readBytes(): ByteArray { val fileManager = NSFileManager.defaultManager() // todo: support fallback path at bundle root? diff --git a/components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/Resource.macos.kt b/components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/Resource.macos.kt index 0e4dee9096..becf5343ef 100644 --- a/components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/Resource.macos.kt +++ b/components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/Resource.macos.kt @@ -5,7 +5,6 @@ package org.jetbrains.compose.resources -import kotlinx.cinterop.ExperimentalForeignApi import kotlinx.cinterop.addressOf import kotlinx.cinterop.usePinned import platform.Foundation.NSData @@ -17,7 +16,6 @@ actual fun resource(path: String): Resource = MacOSResourceImpl(path) @ExperimentalResourceApi private class MacOSResourceImpl(path: String) : AbstractResourceImpl(path) { - @OptIn(ExperimentalForeignApi::class) override suspend fun readBytes(): ByteArray { val currentDirectoryPath = NSFileManager.defaultManager().currentDirectoryPath val contentsAtPath: NSData? = NSFileManager.defaultManager().run {