Update Kotlin

prof18 · Oct 30, 2023 · a1e5a85 · a1e5a85
1 parent 692bebb
commit a1e5a85
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-android-gradle-plugin = "8.0.2"
-android-compile-sdk = "33"
+android-gradle-plugin = "8.1.1"
+android-compile-sdk = "34"
 android-min-sdk = "21"
-android-target-sdk = "33"
-kotlin = "1.8.22"
+android-target-sdk = "34"
+kotlin = "1.9.10"
 library-version-name = "6.0.4"
 
 # Library dependencies
@@ -24,11 +24,11 @@ androidx-lifecycle-viewmodel-ktx = "2.6.1"
 androidx-recyclerview = "1.3.0"
 androidx-swiperefreshlayout = "1.1.0"
 com-google-android-material = "1.9.0"
-compose-multiplatform = "1.4.3"
+compose-multiplatform = "1.5.1"
 io-coil = "2.2.2"
 androidx-lifecycle-extensions = "2.2.0"
-compose-compiler = "1.4.8"
-androidx-compose-bom = "2023.06.01"
+compose-compiler = "1.5.3"
+androidx-compose-bom = "2023.10.01"
 activity-compose = "1.7.2"
 
 [libraries]

diff --git a/rssparser/build.gradle.kts b/rssparser/build.gradle.kts
@@ -13,7 +13,7 @@ kotlin {
         }
     }
 
-    android {
+    androidTarget {
         publishAllLibraryVariants()
         compilations.all {
             kotlinOptions {

diff --git a/rssparser/src/iosMain/kotlin/com/prof18/rssparser/internal/IosXmlFetcher.kt b/rssparser/src/iosMain/kotlin/com/prof18/rssparser/internal/IosXmlFetcher.kt
@@ -1,6 +1,7 @@
 package com.prof18.rssparser.internal
 
 import com.prof18.rssparser.exception.HttpException
+import kotlinx.cinterop.BetaInteropApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import platform.Foundation.NSData
 import platform.Foundation.NSError
@@ -47,6 +48,7 @@ internal class IosXmlFetcher(
         task.resume()
     }
 
+    @OptIn(BetaInteropApi::class)
     override fun generateParserInputFromString(rawRssFeed: String): ParserInput {
         val data = NSString.create(string = rawRssFeed).dataUsingEncoding(NSUTF8StringEncoding)
         return ParserInput(requireNotNull(data))

diff --git a/sample/androidApp/build.gradle.kts b/sample/androidApp/build.gradle.kts
@@ -5,11 +5,12 @@ plugins {
 
 android {
     namespace = "com.prof18.rssparser.sample.android"
-    compileSdk = 33
+    compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
     defaultConfig {
         applicationId = "com.prof18.rssparser.sample.android"
-        minSdk = 24
-        targetSdk = 33
+        minSdk = libs.versions.android.min.sdk.get().toInt()
+        targetSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
+
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 kotlin {
-    android() {
+    androidTarget {
         compilations.all {
             kotlinOptions {
                 jvmTarget = "11"