Skip to content

Commit 57b2f8d

Browse files
authored
LIBMOBILE-1276 - Bump up analytics-kotlin version to latest. (#7)
* LIBMOBILE-1276 - upgraded Analytics version from 1.5.0 to 1.6.2 - upgraded target and compile SDK version from 31 to 33 - upgraded test:core,mockk, test:junit, espresso to latest * LIBMOBILE-1276 - upgraded Analytics version from 1.6.2 to 1.10.3 - fixed api 16 error in forEach block in AppsflyerDestination * LIBMOBILE-1276 - upgraded kotlin core to 1.8.0 - removed google material library
1 parent 4faf8f9 commit 57b2f8d

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = getVersionName()
66

77
plugins {
88
// Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
9-
id("org.jetbrains.kotlin.jvm") version "1.6.0"
9+
id("org.jetbrains.kotlin.jvm") version "1.8.0"
1010

1111
// Apply the java-library plugin for API and implementation separation.
1212
`java-library`
@@ -22,8 +22,8 @@ buildscript {
2222
gradlePluginPortal()
2323
}
2424
dependencies {
25-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
26-
classpath("org.jetbrains.kotlin:kotlin-serialization:1.6.0")
25+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
26+
classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.0")
2727
classpath("com.android.tools.build:gradle:7.0.4")
2828
}
2929
}

lib/build.gradle.kts

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ plugins {
99
val VERSION_NAME: String by project
1010

1111
android {
12-
compileSdk = 31
13-
buildToolsVersion = "31.0.0"
12+
compileSdk = 33
13+
buildToolsVersion = "33.0.1"
1414

1515
defaultConfig {
1616
multiDexEnabled = true
1717
minSdk = 16
18-
targetSdk = 31
18+
targetSdk = 33
1919

2020
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
2121
consumerProguardFiles("proguard-consumer-rules.pro")
@@ -40,15 +40,13 @@ android {
4040
}
4141

4242
dependencies {
43-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
43+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2")
4444

45-
implementation("com.segment.analytics.kotlin:android:1.5.0")
45+
implementation("com.segment.analytics.kotlin:android:1.10.3")
4646
implementation("androidx.multidex:multidex:2.0.1")
4747

48-
implementation("androidx.core:core-ktx:1.7.0")
49-
implementation("androidx.appcompat:appcompat:1.4.1")
50-
implementation("com.google.android.material:material:1.5.0")
51-
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
48+
implementation("androidx.core:core-ktx:1.8.0")
49+
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
5250

5351
implementation("androidx.lifecycle:lifecycle-process:2.4.1")
5452
implementation("androidx.lifecycle:lifecycle-common-java8:2.4.1")
@@ -63,17 +61,17 @@ dependencies {
6361
// Test Dependencies
6462
dependencies {
6563
testImplementation("junit:junit:4.13.2")
66-
androidTestImplementation("androidx.test.ext:junit:1.1.3")
67-
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
68-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0")
64+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
65+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
66+
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
6967

70-
testImplementation("io.mockk:mockk:1.12.2")
68+
testImplementation("io.mockk:mockk:1.12.4")
7169
testImplementation(platform("org.junit:junit-bom:5.7.2"))
7270
testImplementation("org.junit.jupiter:junit-jupiter")
7371

7472
// Add Roboelectric dependencies.
7573
testImplementation("org.robolectric:robolectric:4.7.3")
76-
testImplementation("androidx.test:core:1.4.0")
74+
testImplementation("androidx.test:core:1.5.0")
7775

7876
// Add JUnit4 legacy dependencies.
7977
testImplementation("junit:junit:4.13.2")

lib/src/main/java/com/segment/analytics/kotlin/destinations/appsflyer/AppsflyerDestination.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class AppsFlyerDestination(
189189
}
190190
}
191191
is List<*> -> buildJsonArray {
192-
value.forEach { v ->
192+
value.iterator().forEach { v ->
193193
add(convertToPrimitive(v))
194194
}
195195
}

0 commit comments

Comments
 (0)