set kotlin version 1.9.25, fix detekt and checks

Author: Tetraquark

build.gradle.kts

@@ -14,7 +14,6 @@ buildscript {
     dependencies {
         classpath("dev.icerock.moko:resources-generator")
         classpath(libs.composeJetBrainsPlugin)
-        classpath(libs.composeCompilerPlugin)
         classpath(":resources-build-logic")
     }
 }

gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
-kotlinVersion = "2.1.21"
-androidGradleVersion = "8.9.3"
-androidSdkCommonVersion = "31.10.1"
+kotlinVersion = "1.9.25"
+androidGradleVersion = "8.1.4"
+androidSdkCommonVersion = "31.1.2"
 
 # kotlinx
-kotlinxSerializationVersion = "1.8.1"
-kotlinxCoroutinesVersion = "1.10.2"
+kotlinxSerializationVersion = "1.6.1"
+kotlinxCoroutinesVersion = "1.8.0"
 kotlinxBrowserVersion = "0.3"
 
 # android
-androidAppCompatVersion = "1.7.0"
-androidxActivityComposeVersion = "1.10.1"
-androidxCoreVersion = "1.16.0"
+androidAppCompatVersion = "1.6.1"
+androidxActivityComposeVersion = "1.10.0"
+androidxCoreVersion = "1.15.0"
 
 # android compose
-composeUiVersion = "1.8.1"
+composeUiVersion = "1.7.1"
 
 # jetbrains compose
-composeJetbrainsVersion = "1.8.1"
+composeJetbrainsVersion = "1.7.0"
 
 # jvm
 apacheCommonsTextVersion = "1.10.0"
@@ -67,4 +67,3 @@ kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embe
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }
 mokoMultiplatformPlugin = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformPluginVersion" }
 composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
-composeCompilerPlugin = { module = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlinVersion" }

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.24.6"
+resourcesVersion = "0.25.0"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Tue Jul 25 10:40:31 NOVT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotlin-js-store/yarn.lock

@@ -5,11 +5,11 @@
 import com.android.build.gradle.BaseExtension
 
 configure<BaseExtension> {
-    compileSdkVersion(35)
+    compileSdkVersion(33)
 
     defaultConfig {
         minSdk = 16
-        targetSdk = 35
+        targetSdk = 33
     }
 
     compileOptions {

resources-build-logic/src/main/kotlin/android-base-convention.gradle.kts

@@ -105,6 +105,7 @@ kotlin.targets
 
 fun KonanTarget.getAppleSdk(): String {
     return when (this) {
+        KonanTarget.IOS_ARM32,
         KonanTarget.IOS_ARM64 -> "iphoneos"
 
         KonanTarget.IOS_SIMULATOR_ARM64,
@@ -123,14 +124,16 @@ fun KonanTarget.getAppleSdk(): String {
 
         KonanTarget.WATCHOS_ARM64,
         KonanTarget.WATCHOS_SIMULATOR_ARM64,
-        KonanTarget.WATCHOS_X64  -> "watchsimulator"
+        KonanTarget.WATCHOS_X64,
+        KonanTarget.WATCHOS_X86 -> "watchsimulator"
 
         else -> error("Unsupported target for selecting SDK: $this")
     }
 }
 
 fun KonanTarget.getClangTarget(): String {
     return when (this) {
+        KonanTarget.IOS_ARM32 -> "armv7-apple-ios"
         KonanTarget.IOS_ARM64 -> "aarch64-apple-ios"
         KonanTarget.IOS_SIMULATOR_ARM64 -> "aarch64-apple-ios-simulator"
         KonanTarget.IOS_X64 -> "x86_64-apple-ios-simulator"
@@ -147,6 +150,7 @@ fun KonanTarget.getClangTarget(): String {
         KonanTarget.WATCHOS_DEVICE_ARM64 -> "aarch64-apple-watchos"
         KonanTarget.WATCHOS_SIMULATOR_ARM64 -> "aarch64-apple-watchos-simulator"
         KonanTarget.WATCHOS_X64 -> "x86_64-apple-watchos-simulator"
+        KonanTarget.WATCHOS_X86 -> "i386-apple-watchos"
 
         else -> error("Unsupported target for selecting clang target: $this")
     }

resources-build-logic/src/main/kotlin/apple-bundle-searcher-convention.gradle.kts

@@ -4,7 +4,6 @@
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     id("com.android.library")
@@ -25,8 +24,6 @@ kotlin {
         browser()
         useCommonJs()
     }
-
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         browser()
         useCommonJs()
@@ -35,8 +32,10 @@ kotlin {
     // For https://youtrack.jetbrains.com/issue/KT-61573
     targets.configureEach {
         compilations.configureEach {
-            compileTaskProvider.get().compilerOptions {
-                freeCompilerArgs.add("-Xexpect-actual-classes")
+            compileTaskProvider.configure {
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
             }
         }
     }

resources-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-
 /*
  * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
@@ -15,7 +13,6 @@ plugins {
     id("org.jetbrains.compose")
     id("javadoc-stub-convention")
     id("publication-convention")
-    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -37,7 +34,6 @@ kotlin {
     js(IR) {
         browser()
     }
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         browser()
     }

resources-compose/build.gradle.kts

@@ -5,6 +5,7 @@
 package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.remember
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.LocalSystemTheme
@@ -18,7 +19,7 @@ import org.jetbrains.skia.Image
 import platform.CoreGraphics.CGImageRef
 import platform.UIKit.UIImage
 
-@OptIn(ExperimentalForeignApi::class, InternalComposeUiApi::class)
+@OptIn(ExperimentalForeignApi::class, InternalComposeApi::class, InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
     return remember(LocalSystemTheme.current, imageResource) {