Merge pull request #6 from kalinjul/update-kotlin

update to kotlin 2.0
kalinjul · Jun 11, 2024 · 71d1bf5 · 71d1bf5
2 parents e17a0c7 + 817c4e7
commit 71d1bf5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -10,10 +10,10 @@ Currently, the implementation is rather rudimentary.
 
 Supported Compose version:
 
-Compose version | EasyQRScan Version
-------------------|-------------------
-1.6.x             | 0.1.x
-1.7               | Not yet supported
+ | Compose version | EasyQRScan Version |
+|-----------------|--------------------|
+| 1.6.x           | 0.1.x              |
+| 1.7             | Not yet supported  |
 
 # Dependency
 Add the dependency to your commonMain sourceSet (KMP) / Android dependencies (android only):

diff --git a/...ention/src/main/kotlin/org/publicvalue/convention/ComposeMultiplatformConventionPlugin.kt b/...ention/src/main/kotlin/org/publicvalue/convention/ComposeMultiplatformConventionPlugin.kt
@@ -2,18 +2,10 @@ package org.publicvalue.convention
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
-import org.jetbrains.compose.ComposeExtension
 
 class ComposeMultiplatformConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
         pluginManager.apply("org.jetbrains.compose")
-//        configureCompose()
+        pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
     }
 }
-
-//fun Project.configureCompose() {
-//    with(extensions.getByType<ComposeExtension>()) {
-//        kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
-//    }
-//}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.composeMultiplatform) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kmp) apply false
     alias(libs.plugins.dokka)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,9 +9,9 @@ agp = "8.4.2"
 
 #https://github.com/JetBrains/compose-multiplatform
 compose-multiplatform = "1.6.11"
-kotlin = "1.9.22"
+kotlin = "2.0.0"
 # https://github.com/google/ksp
-ksp = "1.9.22-1.0.17"
+ksp = "2.0.0-1.0.21"
 
 #https://mvnrepository.com/artifact/org.jetbrains.compose.compiler/compiler
 #composeCompiler = "1.5.8.1"
@@ -49,6 +49,7 @@ dokka-gradlePlugin = { module = "org.jetbrains.dokka:org.jetbrains.dokka.gradle.
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kmp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"}
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus-publish-plugin"}

diff --git a/sample-app/android-app/build.gradle.kts b/sample-app/android-app/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("org.publicvalue.convention.android.application")
     id("org.publicvalue.convention.kotlin.multiplatform.mobile")
-    id("org.jetbrains.compose")
+    id("org.publicvalue.convention.compose.multiplatform")
 }
 
 kotlin {

diff --git a/sample-app/shared/build.gradle.kts b/sample-app/shared/build.gradle.kts
@@ -5,7 +5,7 @@ import org.publicvalue.convention.config.configureIosTargets
 plugins {
     id("org.publicvalue.convention.android.library")
     id("org.publicvalue.convention.kotlin.multiplatform.mobile")
-    id("org.jetbrains.compose")
+    id("org.publicvalue.convention.compose.multiplatform")
 }
 
 kotlin {

diff --git a/scanner/build.gradle.kts b/scanner/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("org.publicvalue.convention.android.library")
     id("org.publicvalue.convention.kotlin.multiplatform.mobile")
     id("org.publicvalue.convention.centralPublish")
-    id("org.jetbrains.compose")
+    id("org.publicvalue.convention.compose.multiplatform")
 }
 
 description = "Compose Multiplatform QR Code Scanner for Android/iOS"

diff --git a/scanner/src/iosMain/kotlin/ScannerView.kt b/scanner/src/iosMain/kotlin/ScannerView.kt
@@ -40,7 +40,6 @@ import platform.Foundation.NSError
 import platform.QuartzCore.CALayer
 import platform.QuartzCore.CATransaction
 import platform.QuartzCore.kCATransactionDisableActions
-import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
 import platform.UIKit.UIDeviceOrientation
 import platform.UIKit.UIView
@@ -190,7 +189,7 @@ class ScannerCameraCoordinator(
         }
     }
 
-    override fun captureOutput(output: platform.AVFoundation.AVCaptureOutput, didOutputMetadataObjects: kotlin.collections.List<*>, fromConnection: platform.AVFoundation.AVCaptureConnection) {
+    override fun captureOutput(output: platform.AVFoundation.AVCaptureOutput, didOutputMetadataObjects: List<*>, fromConnection: platform.AVFoundation.AVCaptureConnection) {
         val metadataObject = didOutputMetadataObjects.firstOrNull() as? AVMetadataMachineReadableCodeObject
         metadataObject?.stringValue?.let { onFound(it) }
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,36 +14,6 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         google()
-        // workaround for https://youtrack.jetbrains.com/issue/KT-51379
-        exclusiveContent {
-            forRepository {
-                ivy("https://download.jetbrains.com/kotlin/native/builds") {
-                    name = "Kotlin Native"
-                    patternLayout {
-
-                        // example download URLs:
-                        // https://download.jetbrains.com/kotlin/native/builds/releases/1.7.20/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.7.20.tar.gz
-                        // https://download.jetbrains.com/kotlin/native/builds/releases/1.7.20/windows-x86_64/kotlin-native-prebuilt-windows-x86_64-1.7.20.zip
-                        // https://download.jetbrains.com/kotlin/native/builds/releases/1.7.20/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.7.20.tar.gz
-                        listOf(
-                            "macos-x86_64",
-                            "macos-aarch64",
-                            "osx-x86_64",
-                            "osx-aarch64",
-                            "linux-x86_64",
-                            "windows-x86_64",
-                            "iosX64"
-                        ).forEach { os ->
-                            listOf("dev", "releases").forEach { stage ->
-                                artifact("$stage/[revision]/$os/[artifact]-[revision].[ext]")
-                            }
-                        }
-                    }
-                    metadataSources { artifact() }
-                }
-            }
-            filter { includeModuleByRegex(".*", ".*kotlin-native-prebuilt.*") }
-        }
     }
 }