From 6788c82572b2d763a01db440dca84a665e834425 Mon Sep 17 00:00:00 2001 From: markvdouw Date: Wed, 1 Nov 2023 11:19:30 -0300 Subject: [PATCH 01/10] fixes --- kits/adjust-kit | 2 +- kits/googleanalyticsfirebasega4-kit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 From efcf0be6de81c7b6fcf59455cefeae20e7e00792 Mon Sep 17 00:00:00 2001 From: markvdouw Date: Thu, 2 Nov 2023 11:23:17 -0300 Subject: [PATCH 02/10] Incrementing kt build version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c61c1030c..53b8dccbd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.22' + ext.kotlin_version = '1.8.0' ext.gradle_version = '7.3.1' repositories { From 4dc82de0724fa66d6a6cec9f6d9a74876c26d4d3 Mon Sep 17 00:00:00 2001 From: markvdouw Date: Thu, 2 Nov 2023 12:14:25 -0300 Subject: [PATCH 03/10] fix foreach --- .../main/java/com/mparticle/internal/SideloadedKitsUtils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..2ddb3f7a5 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 0..kits.size) { + val kit = kits.get(i) if (!addedIds.contains(kit.kitId())) { kit.getJsonConfig()?.let { results.put(it) From eb27314cf52b915f86d761e1973bafb4c69c314e Mon Sep 17 00:00:00 2001 From: markvdouw Date: Thu, 2 Nov 2023 12:34:47 -0300 Subject: [PATCH 04/10] Fix --- .../src/main/java/com/mparticle/internal/SideloadedKitsUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2ddb3f7a5..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,7 @@ object SideloadedKitsUtils { } } } - for (i in 0..kits.size) { + for (i in kits.indices) { val kit = kits.get(i) if (!addedIds.contains(kit.kitId())) { kit.getJsonConfig()?.let { From b40e36823971d5e34402737a72a574e5170e8feb Mon Sep 17 00:00:00 2001 From: markvdouw Date: Thu, 2 Nov 2023 14:39:46 -0300 Subject: [PATCH 05/10] kits update --- kits/apptentive-kit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f815132ba18fea5362d66edcde94554430d358f2 Mon Sep 17 00:00:00 2001 From: markvdouw Date: Thu, 2 Nov 2023 16:47:59 -0300 Subject: [PATCH 06/10] Kits lint fix --- kits/kochava-kit | 2 +- kits/onetrust-kit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 9aa09393f00d065ae89d25f972cdb922780daa80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 23:06:58 +0000 Subject: [PATCH 07/10] chore: bump org.mockito:mockito-android from 4.9.0 to 5.7.0 (#445) Bumps [org.mockito:mockito-android](https://github.com/mockito/mockito) from 4.9.0 to 5.7.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v5.7.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-android dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- testutils/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From 7dd79ae7c5e38fa48387a46413c6d8f63f10d099 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 22:58:00 +0000 Subject: [PATCH 08/10] chore: bump com.guardsquare:proguard-gradle from 7.3.0 to 7.4.1 (#453) Bumps [com.guardsquare:proguard-gradle](https://github.com/Guardsquare/proguard) from 7.3.0 to 7.4.1. - [Release notes](https://github.com/Guardsquare/proguard/releases) - [Commits](https://github.com/Guardsquare/proguard/compare/v7.3.0...v7.4.1) --- updated-dependencies: - dependency-name: com.guardsquare:proguard-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tooling/custom-lint-rules/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 tooling/custom-lint-rules/build.gradle diff --git a/tooling/custom-lint-rules/build.gradle b/tooling/custom-lint-rules/build.gradle old mode 100755 new mode 100644 index 99af1017b..b1e1414b8 --- 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' } } From 086191d74cd0b02bd471e223ed1435c7b5f0375e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 23:02:29 +0000 Subject: [PATCH 09/10] chore: bump kotlin_version from 1.8.0 to 1.9.21 (#455) Bumps `kotlin_version` from 1.8.0 to 1.9.21. Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.8.0 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.9.21) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.8.0 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.9.21) Updates `org.jetbrains.kotlin:kotlin-test-junit` from 1.8.0 to 1.9.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.9.21) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 53b8dccbd..b489a793b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.9.21' ext.gradle_version = '7.3.1' repositories { From 94b4224374c296a1d3d087eb4eda24a0a0ef1d80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 23:03:18 +0000 Subject: [PATCH 10/10] chore: bump org.codehaus.groovy:groovy-all from 3.0.13 to 3.0.19 Bumps [org.codehaus.groovy:groovy-all](https://github.com/apache/groovy) from 3.0.13 to 3.0.19. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy-all dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tooling/custom-lint-rules/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/custom-lint-rules/build.gradle b/tooling/custom-lint-rules/build.gradle index b1e1414b8..a9c88c82d 100644 --- a/tooling/custom-lint-rules/build.gradle +++ b/tooling/custom-lint-rules/build.gradle @@ -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"