diff --git a/android-core/src/main/java/com/mparticle/internal/SideloadedKitsUtils.kt b/android-core/src/main/java/com/mparticle/internal/SideloadedKitsUtils.kt index 705dc9e91..8443a5729 100644 --- a/android-core/src/main/java/com/mparticle/internal/SideloadedKitsUtils.kt +++ b/android-core/src/main/java/com/mparticle/internal/SideloadedKitsUtils.kt @@ -17,7 +17,8 @@ object SideloadedKitsUtils { } } } - kits.forEach { kit -> + for (i in kits.indices) { + val kit = kits.get(i) if (!addedIds.contains(kit.kitId())) { kit.getJsonConfig()?.let { results.put(it) diff --git a/build.gradle b/build.gradle index c61c1030c..b489a793b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.22' + ext.kotlin_version = '1.9.21' ext.gradle_version = '7.3.1' repositories { diff --git a/kits/adjust-kit b/kits/adjust-kit index 7cf389350..c74fb1abe 160000 --- a/kits/adjust-kit +++ b/kits/adjust-kit @@ -1 +1 @@ -Subproject commit 7cf389350b27b6ea265a3d4907fd79867b922df2 +Subproject commit c74fb1abe6fd1cbaad850159bc384dba1d3c7e0c diff --git a/kits/apptentive-kit b/kits/apptentive-kit index 13d425cba..e0bbf4a1a 160000 --- a/kits/apptentive-kit +++ b/kits/apptentive-kit @@ -1 +1 @@ -Subproject commit 13d425cbaa3b61cafc5b5a288d40b375d802dea1 +Subproject commit e0bbf4a1acaed38ea17e8191a143b503c85ca9f0 diff --git a/kits/googleanalyticsfirebasega4-kit b/kits/googleanalyticsfirebasega4-kit index 299ce3040..8b679b013 160000 --- a/kits/googleanalyticsfirebasega4-kit +++ b/kits/googleanalyticsfirebasega4-kit @@ -1 +1 @@ -Subproject commit 299ce30407a4c08291139a54f0c324a0aa97bf0e +Subproject commit 8b679b0138cbb0e494362e2ac17a601fbc3d7e2d diff --git a/kits/kochava-kit b/kits/kochava-kit index 2d595fc78..45e2e53b0 160000 --- a/kits/kochava-kit +++ b/kits/kochava-kit @@ -1 +1 @@ -Subproject commit 2d595fc787336fb0405b7571d128b6e28bc9051e +Subproject commit 45e2e53b09efb3338f95fb31494a7010f0a8c552 diff --git a/kits/onetrust-kit b/kits/onetrust-kit index 99de347b4..8521824f0 160000 --- a/kits/onetrust-kit +++ b/kits/onetrust-kit @@ -1 +1 @@ -Subproject commit 99de347b4653c7cc3db1374592a0be3ee6b83893 +Subproject commit 8521824f08a640b90e2fd520f51fcf7570651c48 diff --git a/testutils/build.gradle b/testutils/build.gradle index 3e07b087c..a0acf4218 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) compileOnly project(':android-core') compileOnly project(':android-kit-base') - compileOnly 'org.mockito:mockito-android:4.9.0' + compileOnly 'org.mockito:mockito-android:5.7.0' api 'androidx.annotation:annotation:1.5.0' api 'androidx.test.ext:junit:1.1.4' diff --git a/tooling/custom-lint-rules/build.gradle b/tooling/custom-lint-rules/build.gradle old mode 100755 new mode 100644 index 99af1017b..a9c88c82d --- a/tooling/custom-lint-rules/build.gradle +++ b/tooling/custom-lint-rules/build.gradle @@ -18,7 +18,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.android.tools.build:gradle:$gradle_version" - classpath 'com.guardsquare:proguard-gradle:7.3.0' + classpath 'com.guardsquare:proguard-gradle:7.4.1' } } @@ -42,7 +42,7 @@ dependencies { implementation configurations.lintJar compileOnly "com.android.tools.lint:lint-api:$lintVersion" compileOnly "com.android.tools.lint:lint-checks:$lintVersion" - compileOnly 'org.codehaus.groovy:groovy-all:3.0.13' + compileOnly 'org.codehaus.groovy:groovy-all:3.0.19' testImplementation 'junit:junit:4.13.2' testImplementation "com.android.tools.lint:lint:$lintVersion" testImplementation "com.android.tools.lint:lint-tests:$lintVersion"