MOEN-31584: AGP + Compile SDK + Kotlin Version Update (#40)

moengage · Jul 3, 2024 · 661bcfa · 661bcfa
1 parent 4ea3199
commit 661bcfa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # moengage-segment-kotlin-destination
 
+# Next Release
+
+## Next Version
+
+- MOEN-31584: AGP Version update from `8.2.2` to `8.4.0`
+- MOEN-31584: Kotlin version updated from `1.7.10` to `1.9.23`
+- MOEN-31584: Compile SDK Version updated to 34
+
+
 # 10-06-2024
 
 ## 2.1.1

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     alias(moengageInternal.plugins.plugin.android.lib) apply false
     alias(moengageInternal.plugins.plugin.kotlin.android) apply false
     alias(moengageInternal.plugins.plugin.dokka) apply false
-    id("com.google.gms.google-services") version "4.3.15" apply false
+    alias(libs.plugins.plugin.google.play.service) apply false
     alias(moengageInternal.plugins.plugin.kotlin.serialization) apply false
     alias(moengageInternal.plugins.plugin.ktlint) apply false
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,15 @@
 [libraries]
-moengageCore = { module = "com.moengage:moe-android-sdk", version = "13.02.00" }
-segment = { module = "com.segment.analytics.android:analytics", version = "4.9.0" }
-segmentKotlin = { module = "com.segment.analytics.kotlin:android", version = "1.5.0" }
+moengageCore = { module = "com.moengage:moe-android-sdk", version = "13.03.00" }
+segment = { module = "com.segment.analytics.android:analytics", version = "4.11.0" }
+segmentKotlin = { module = "com.segment.analytics.kotlin:android", version = "1.16.0" }
+coreKtx = { module = "androidx.core:core-ktx", version = "1.13.1" }
+appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
+espressoCore = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" }
+extJunit = { module = "androidx.test.ext:junit", version = "1.1.5" }
+firebaseMessaging = { module = "com.google.firebase:firebase-messaging", version = "24.0.0" }
+junit = { module = "junit:junit", version = "4.13.2" }
+lifecycleProcess = { module = "androidx.lifecycle:lifecycle-process", version = "2.7.0" }
+material = { module = "com.google.android.material:material", version = "1.12.0" }
+
+[plugins]
+plugin-google-play-service = { id = "com.google.gms.google-services", version = "4.4.1" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
diff --git a/kotlin-example/build.gradle.kts b/kotlin-example/build.gradle.kts
@@ -6,15 +6,15 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     namespace = "com.moengage.segment.kotlin.sampleapp"
     val properties = Properties()
     properties.load(file("../local.properties").inputStream())
 
     defaultConfig {
         applicationId = "com.moengage.segment.kotlin.sampleapp"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
 
@@ -47,17 +47,17 @@ android {
 
 dependencies {
 
-    implementation("androidx.core:core-ktx:1.7.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.lifecycle:lifecycle-process:2.5.1")
-    implementation("com.segment.analytics.kotlin:android:1.10.0")
+    implementation(libs.coreKtx)
+    implementation(libs.appcompat)
+    implementation(libs.material)
+    implementation(libs.lifecycleProcess)
+    implementation(libs.segmentKotlin)
     implementation(projects.moengageSegmentKotlinDestination)
     implementation(moengage.inapp)
     implementation(moengageInternal.kotlinStdLib)
-    implementation("com.google.firebase:firebase-messaging:23.0.0")
+    implementation(libs.firebaseMessaging)
 
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.extJunit)
+    androidTestImplementation(libs.espressoCore)
 }
diff --git a/moengage-segment-kotlin-destination/build.gradle.kts b/moengage-segment-kotlin-destination/build.gradle.kts
@@ -11,7 +11,7 @@ val libVersionName = project.findProperty("VERSION_NAME") as String
 
 android {
     namespace = "com.segment.analytics.kotlin.destinations.moengage"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,10 +15,10 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("moengageInternal") {
-            from("com.moengage:android-dependency-catalog-internal:2.0.1")
+            from("com.moengage:android-dependency-catalog-internal:2.1.0")
         }
         create("moengage") {
-            from("com.moengage:android-dependency-catalog:4.2.1")
+            from("com.moengage:android-dependency-catalog:4.3.0")
         }
     }
 }