Kotlin 2.0.0 support and bumping dependency versions (#35)

* Kotlin 2.0.0 and bumping library versions * Increasing library version
mirzemehdi · Jun 5, 2024 · b903239 · b903239
1 parent 20c32a1
commit b903239
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ captures
 !*.xcodeproj/project.xcworkspace/
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
+.kotlin
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # KMPNotifier - Kotlin Multiplatform Push Notification
 [![Build](https://github.com/mirzemehdi/KMPNotifier/actions/workflows/build.yml/badge.svg)](https://github.com/mirzemehdi/KMPNotifier/actions/workflows/build.yml) 
-[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.22-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.0.0-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
 [![Maven Central](https://img.shields.io/maven-central/v/io.github.mirzemehdi/kmpnotifier?color=blue)](https://search.maven.org/search?q=g:io.github.mirzemehdi)
 
 ![badge-android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     // this is necessary to avoid the plugins to be loaded multiple times
     // in each subproject's classloader
     alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
@@ -20,7 +21,7 @@ plugins {
 
 allprojects {
     group = "io.github.mirzemehdi"
-    version = "0.6.0"
+    version = "1.0.0"
     val sonatypeUsername = gradleLocalProperties(rootDir).getProperty("sonatypeUsername")
     val sonatypePassword = gradleLocalProperties(rootDir).getProperty("sonatypePassword")
     val gpgKeySecret = gradleLocalProperties(rootDir).getProperty("gpgKeySecret")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,24 @@
 [versions]
-compose = "1.6.1"
-compose-plugin = "1.6.0-rc03"
-compose-compiler = "1.5.8"
-agp = "8.1.3"
+compose = "1.6.7"
+compose-plugin = "1.6.10"
+agp = "8.1.4"
 android-minSdk = "21"
 android-compileSdk = "34"
 android-targetSdk = "34"
-androidx-activityCompose = "1.8.0"
-androidx-core-ktx = "1.12.0"
-androidx-appcompat = "1.6.1"
-androidx-material = "1.10.0"
+androidx-activityCompose = "1.9.0"
+androidx-core-ktx = "1.13.1"
+androidx-appcompat = "1.7.0"
+androidx-material = "1.12.0"
 androidx-constraintlayout = "2.1.4"
 androidx-test-junit = "1.1.5"
 androidx-espresso-core = "3.5.1"
 androidx-startup-runtime = "1.1.1"
-kotlin = "1.9.22"
+kotlin = "2.0.0"
 junit = "4.13.2"
-koin = "3.5.0"
+koin = "3.5.6"
 kotlinx-binary-validator = "0.13.2"
 dokka = "1.9.10"
-firebase-messaging = "23.3.0"
+firebase-messaging = "24.0.0"
 
 
 [libraries]
@@ -49,6 +48,7 @@ firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging
 
 [plugins]
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
-
+    alias(libs.plugins.composeCompiler)
     id("com.google.gms.google-services")
 }
 
@@ -64,9 +64,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/sample/src/androidMain/kotlin/com/mmk/kmpnotifier/sample/MainActivity.kt b/sample/src/androidMain/kotlin/com/mmk/kmpnotifier/sample/MainActivity.kt
@@ -22,7 +22,7 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         NotifierManager.onCreateOrOnNewIntent(intent)
     }