Skip to content

Commit f8b7d2b

Browse files
MaTriXymatrixy-iqtmirzemehdi
authored
Updated versions and dependencies (#141)
* Updated versions and dependencies - Updated Gradle to 9.0.0 - Updated Kotlin to 2.2.0 - Updated various library dependencies including AndroidX, Compose, and KMP libraries - Updated iOS dependencies and project configuration including Firebase 12.0.0 - Modernized build configurations * Resetting some files * Updating api version to 1.6.0 --------- Co-authored-by: Yossi Elkrief <yossi@iqtmedia.com> Co-authored-by: Mirzamehdi <mirzemehdi@gmail.com>
1 parent dea7957 commit f8b7d2b

File tree

10 files changed

+98
-73
lines changed

10 files changed

+98
-73
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
alias(libs.plugins.dokka) apply false
1111
alias(libs.plugins.kotlinx.binary.validator)
1212
alias(libs.plugins.mavenPublish) apply false
13-
id("com.google.gms.google-services") version "4.4.0" apply false
13+
alias(libs.plugins.google.services) apply false
1414
}
1515

1616
apiValidation {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ kotlin.mpp.enableCInteropCommonization=true
1919
#Development
2020
development=true
2121

22-
kmpNotifierVersion=1.5.1
22+
kmpNotifierVersion=1.6.0

‎gradle/libs.versions.toml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
2-
compose = "1.7.8"
3-
compose-plugin = "1.7.3"
4-
agp = "8.7.3"
5-
android-minSdk = "21"
6-
android-compileSdk = "35"
7-
android-targetSdk = "35"
2+
compose = "1.8.3"
3+
compose-plugin = "1.8.2"
4+
agp = "8.10.1" #Update this when updating Android Studio
5+
android-minSdk = "23"
6+
android-compileSdk = "36"
7+
android-targetSdk = "36"
88
androidx-activityCompose = "1.10.1"
9-
androidx-core-ktx = "1.15.0"
9+
androidx-core-ktx = "1.16.0"
1010
androidx-startup-runtime = "1.2.0"
11-
kotlin = "2.1.10"
12-
koin = "4.0.2"
13-
kotlinx-binary-validator = "0.16.3"
11+
kotlin = "2.2.0"
12+
koin = "4.1.0"
13+
kotlinx-binary-validator = "0.18.1"
1414
dokka = "2.0.0"
15-
firebase-messaging = "24.1.0"
16-
kotlinx-coroutine = "1.10.1"
17-
kotlinx-browser = "0.3"
18-
mavenPublish = "0.31.0"
19-
15+
firebase-messaging = "25.0.0"
16+
kotlinx-coroutine = "1.10.2"
17+
kotlinx-browser = "0.4"
18+
mavenPublish = "0.34.0"
19+
googleServices = "4.4.3"
2020

2121

2222

@@ -32,7 +32,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
3232
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activityCompose" }
3333
androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup-runtime" }
3434
koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
35-
firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" ,version.ref="firebase-messaging"}
35+
firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging" ,version.ref="firebase-messaging"}
3636

3737

3838
[plugins]
@@ -44,4 +44,5 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
4444
kotlinNativeCocoaPods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
4545
kotlinx-binary-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binary-validator" }
4646
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
47-
mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
47+
mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
48+
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7-
zipStorePath=wrapper/dists
7+
zipStorePath=wrapper/dists

‎iosApp/iosApp.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@
417417
isa = XCRemoteSwiftPackageReference;
418418
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
419419
requirement = {
420-
kind = upToNextMajorVersion;
421-
minimumVersion = 10.17.0;
420+
kind = exactVersion;
421+
version = 12.1.0;
422422
};
423423
};
424424
/* End XCRemoteSwiftPackageReference section */

‎iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 40 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kmpnotifier/api/android/kmpnotifier.api‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public abstract interface class com/mmk/kmpnotifier/notification/Notifier {
3737
public abstract fun notify (ILjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
3838
public abstract fun notify (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)I
3939
public abstract fun notify (Lkotlin/jvm/functions/Function1;)V
40+
public static synthetic fun notify$default (Lcom/mmk/kmpnotifier/notification/Notifier;ILjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
41+
public static synthetic fun notify$default (Lcom/mmk/kmpnotifier/notification/Notifier;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)I
4042
public abstract fun remove (I)V
4143
public abstract fun removeAll ()V
4244
}
@@ -78,11 +80,11 @@ public final class com/mmk/kmpnotifier/notification/NotifierManager {
7880
}
7981

8082
public abstract interface class com/mmk/kmpnotifier/notification/NotifierManager$Listener {
81-
public abstract fun onNewToken (Ljava/lang/String;)V
82-
public abstract fun onNotificationClicked (Ljava/util/Map;)V
83-
public abstract fun onPayloadData (Ljava/util/Map;)V
84-
public abstract fun onPushNotification (Ljava/lang/String;Ljava/lang/String;)V
85-
public abstract fun onPushNotificationWithPayloadData (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
83+
public fun onNewToken (Ljava/lang/String;)V
84+
public fun onNotificationClicked (Ljava/util/Map;)V
85+
public fun onPayloadData (Ljava/util/Map;)V
86+
public fun onPushNotification (Ljava/lang/String;Ljava/lang/String;)V
87+
public fun onPushNotificationWithPayloadData (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
8688
}
8789

8890
public final class com/mmk/kmpnotifier/notification/NotifierManager$Listener$DefaultImpls {
@@ -174,7 +176,9 @@ public final class com/mmk/kmpnotifier/permission/AndroidPermissionUtilKt {
174176

175177
public abstract interface class com/mmk/kmpnotifier/permission/PermissionUtil {
176178
public abstract fun askNotificationPermission (Lkotlin/jvm/functions/Function1;)V
179+
public static synthetic fun askNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
177180
public abstract fun hasNotificationPermission (Lkotlin/jvm/functions/Function1;)V
181+
public static synthetic fun hasNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
178182
}
179183

180184
public final class com/mmk/kmpnotifier/permission/PermissionUtil$DefaultImpls {

‎kmpnotifier/api/jvm/kmpnotifier.api‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public abstract interface class com/mmk/kmpnotifier/notification/Notifier {
3636
public abstract fun notify (ILjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
3737
public abstract fun notify (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)I
3838
public abstract fun notify (Lkotlin/jvm/functions/Function1;)V
39+
public static synthetic fun notify$default (Lcom/mmk/kmpnotifier/notification/Notifier;ILjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
40+
public static synthetic fun notify$default (Lcom/mmk/kmpnotifier/notification/Notifier;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)I
3941
public abstract fun remove (I)V
4042
public abstract fun removeAll ()V
4143
}
@@ -77,11 +79,11 @@ public final class com/mmk/kmpnotifier/notification/NotifierManager {
7779
}
7880

7981
public abstract interface class com/mmk/kmpnotifier/notification/NotifierManager$Listener {
80-
public abstract fun onNewToken (Ljava/lang/String;)V
81-
public abstract fun onNotificationClicked (Ljava/util/Map;)V
82-
public abstract fun onPayloadData (Ljava/util/Map;)V
83-
public abstract fun onPushNotification (Ljava/lang/String;Ljava/lang/String;)V
84-
public abstract fun onPushNotificationWithPayloadData (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
82+
public fun onNewToken (Ljava/lang/String;)V
83+
public fun onNotificationClicked (Ljava/util/Map;)V
84+
public fun onPayloadData (Ljava/util/Map;)V
85+
public fun onPushNotification (Ljava/lang/String;Ljava/lang/String;)V
86+
public fun onPushNotificationWithPayloadData (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
8587
}
8688

8789
public final class com/mmk/kmpnotifier/notification/NotifierManager$Listener$DefaultImpls {
@@ -163,7 +165,9 @@ public final class com/mmk/kmpnotifier/notification/configuration/NotificationPl
163165

164166
public abstract interface class com/mmk/kmpnotifier/permission/PermissionUtil {
165167
public abstract fun askNotificationPermission (Lkotlin/jvm/functions/Function1;)V
168+
public static synthetic fun askNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
166169
public abstract fun hasNotificationPermission (Lkotlin/jvm/functions/Function1;)V
170+
public static synthetic fun hasNotificationPermission$default (Lcom/mmk/kmpnotifier/permission/PermissionUtil;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
167171
}
168172

169173
public final class com/mmk/kmpnotifier/permission/PermissionUtil$DefaultImpls {

‎kmpnotifier/build.gradle.kts‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import com.vanniktech.maven.publish.JavadocJar
22
import com.vanniktech.maven.publish.KotlinMultiplatform
3-
import com.vanniktech.maven.publish.SonatypeHost
43
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
55

66
plugins {
77
alias(libs.plugins.kotlinMultiplatform)
@@ -13,11 +13,9 @@ plugins {
1313
kotlin {
1414
explicitApi()
1515
androidTarget {
16-
publishAllLibraryVariants()
17-
compilations.all {
18-
kotlinOptions {
19-
jvmTarget = "1.8"
20-
}
16+
publishLibraryVariants("release", "debug")
17+
compilerOptions {
18+
jvmTarget.set(JvmTarget.JVM_17)
2119
}
2220
}
2321

@@ -38,7 +36,7 @@ kotlin {
3836

3937

4038
cocoapods {
41-
ios.deploymentTarget = "14.1"
39+
ios.deploymentTarget = "15.4"
4240
framework {
4341
baseName = "KMPNotifier"
4442
isStatic = true
@@ -83,7 +81,6 @@ android {
8381

8482
defaultConfig {
8583
minSdk = libs.versions.android.minSdk.get().toInt()
86-
targetSdk = libs.versions.android.targetSdk.get().toInt()
8784
}
8885

8986
packaging {
@@ -92,8 +89,8 @@ android {
9289
}
9390
}
9491
compileOptions {
95-
sourceCompatibility = JavaVersion.VERSION_1_8
96-
targetCompatibility = JavaVersion.VERSION_1_8
92+
sourceCompatibility = JavaVersion.VERSION_17
93+
targetCompatibility = JavaVersion.VERSION_17
9794
}
9895
}
9996

@@ -135,7 +132,8 @@ mavenPublishing {
135132
}
136133
}
137134

138-
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
135+
136+
publishToMavenCentral()
139137
signAllPublications()
140138
}
141139

0 commit comments

Comments
 (0)