Skip to content

chore: bump org.codehaus.groovy:groovy-all from 3.0.13 to 3.0.19 #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dependabot wants to merge 10 commits into from
Closed

chore: bump org.codehaus.groovy:groovy-all from 3.0.13 to 3.0.19 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6788c82
fixes
Nov 1, 2023
efcf0be
Incrementing kt build version
Nov 2, 2023
4dc82de
fix foreach
Nov 2, 2023
eb27314
Fix
Nov 2, 2023
b40e368
kits update
Nov 2, 2023
f815132
Kits lint fix
Nov 2, 2023
9aa0939
chore: bump org.mockito:mockito-android from 4.9.0 to 5.7.0 (#445)
dependabot[bot] Nov 3, 2023
7dd79ae
chore: bump com.guardsquare:proguard-gradle from 7.3.0 to 7.4.1 (#453)
dependabot[bot] Nov 22, 2023
086191d
chore: bump kotlin_version from 1.8.0 to 1.9.21 (#455)
dependabot[bot] Nov 23, 2023
94b4224
chore: bump org.codehaus.groovy:groovy-all from 3.0.13 to 3.0.19
dependabot[bot] Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion android-core/src/main/java/com/mparticle/internal/SideloadedKitsUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.7.22'
ext.kotlin_version = '1.9.21'
ext.gradle_version = '7.3.1'

repositories {
Expand Down
2 changes: 1 addition & 1 deletion kits/adjust-kit
Open in desktop
Submodule adjust-kit updated 0 files
2 changes: 1 addition & 1 deletion kits/apptentive-kit
Open in desktop
Submodule apptentive-kit updated 1 files
+15 −12 src/main/kotlin/com/mparticle/kits/ApptentiveKit.kt
2 changes: 1 addition & 1 deletion kits/googleanalyticsfirebasega4-kit
Open in desktop
Submodule googleanalyticsfirebasega4-kit updated 1 files
+1 −1 src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4Kit.kt
2 changes: 1 addition & 1 deletion kits/kochava-kit
Open in desktop
Submodule kochava-kit updated 1 files
+1 −1 src/main/kotlin/com/mparticle/kits/KochavaKit.kt
2 changes: 1 addition & 1 deletion kits/onetrust-kit
Open in desktop
Submodule onetrust-kit updated 2 files
+1 −1 build.gradle
+1 −1 src/main/kotlin/com/mparticle/kits/OneTrustKit.kt
2 changes: 1 addition & 1 deletion testutils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions tooling/custom-lint-rules/build.gradle
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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"
Expand Down