diff --git a/benchmarks/android/app/build.gradle b/benchmarks/android/app/build.gradle index b64f27c14..592aa133c 100644 --- a/benchmarks/android/app/build.gradle +++ b/benchmarks/android/app/build.gradle @@ -129,7 +129,7 @@ dependencies { // Benchmark tools from dd-sdk-android are used for vitals recording // Remember to bump thid alongside the main dd-sdk-android dependencies - implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.5.0") + implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.7.0") // Required for compile-time access to Datadog.getInstance() required by BenchmarkVitalsModuleImpl - implementation("com.datadoghq:dd-sdk-android-core:3.5.0") + implementation("com.datadoghq:dd-sdk-android-core:3.7.0") } diff --git a/benchmarks/android/gradle/wrapper/gradle-wrapper.properties b/benchmarks/android/gradle/wrapper/gradle-wrapper.properties index e0fd02028..de413606b 100644 --- a/benchmarks/android/gradle/wrapper/gradle-wrapper.properties +++ b/benchmarks/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/example-new-architecture/android/app/build.gradle b/example-new-architecture/android/app/build.gradle index 54b81d034..de615bd36 100644 --- a/example-new-architecture/android/app/build.gradle +++ b/example-new-architecture/android/app/build.gradle @@ -107,10 +107,10 @@ dependencies { } constraints { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.25") { because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") } - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.25") { because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib") } } diff --git a/example-new-architecture/android/gradle/wrapper/gradle-wrapper.properties b/example-new-architecture/android/gradle/wrapper/gradle-wrapper.properties index df97d72b8..aaaabb3cb 100644 --- a/example-new-architecture/android/gradle/wrapper/gradle-wrapper.properties +++ b/example-new-architecture/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 94eff2f60..fc0e11a30 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -109,10 +109,10 @@ dependencies { } constraints { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.25") { because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") } - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.25") { because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib") } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 8bdda7996..722eb07a2 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jan 15 10:26:26 WET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index e5d227680..c5b57b139 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -14,12 +14,12 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.6.1" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8" - classpath 'com.github.bjoernq:unmockplugin:0.7.9' + classpath 'com.github.bjoernq:unmockplugin:0.9.0' // Uncomment here and in settings.gradle for getting rid of IDE errors for new architecture: // classpath "com.facebook.react:react-native-gradle-plugin" } @@ -194,40 +194,40 @@ dependencies { api "com.facebook.react:react-android:$reactNativeVersion" } implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compileOnly "com.squareup.okhttp3:okhttp:3.12.13" + compileOnly "com.squareup.okhttp3:okhttp:3.14.9" // dd-sdk-android-rum requires androidx.metrics:metrics-performance. // From 2.21.0, it uses 1.0.0-beta02, which requires Gradle 8.6.0. // This breaks builds if the React Native target is below 0.76.0. as it relies on Gradle 8.5.0. // To avoid this, we enforce 1.0.0-beta01 on RN < 0.76.0 if (reactNativeMinorVersion < 76) { - implementation("com.datadoghq:dd-sdk-android-rum:3.5.0") { + implementation("com.datadoghq:dd-sdk-android-rum:3.7.0") { exclude group: "androidx.metrics", module: "metrics-performance" } - implementation "androidx.metrics:metrics-performance:1.0.0-beta01" + implementation "androidx.metrics:metrics-performance:1.0.0" } else { - implementation "com.datadoghq:dd-sdk-android-rum:3.5.0" + implementation "com.datadoghq:dd-sdk-android-rum:3.7.0" } - implementation "com.datadoghq:dd-sdk-android-logs:3.5.0" - implementation "com.datadoghq:dd-sdk-android-trace:3.5.0" - implementation "com.datadoghq:dd-sdk-android-webview:3.5.0" - implementation "com.datadoghq:dd-sdk-android-ndk:3.5.0" - implementation "com.datadoghq:dd-sdk-android-flags:3.5.0" - implementation "com.google.code.gson:gson:2.10.0" - testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.6.2" - testImplementation "org.mockito:mockito-junit-jupiter:3.4.6" - testImplementation "org.assertj:assertj-core:3.18.1" - testImplementation "com.github.xgouchet.Elmyr:core:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:inject:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1" - testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0" + implementation "com.datadoghq:dd-sdk-android-logs:3.7.0" + implementation "com.datadoghq:dd-sdk-android-trace:3.7.0" + implementation "com.datadoghq:dd-sdk-android-webview:3.7.0" + implementation "com.datadoghq:dd-sdk-android-ndk:3.7.0" + implementation "com.datadoghq:dd-sdk-android-flags:3.7.0" + implementation "com.google.code.gson:gson:2.13.2" + testImplementation "org.junit.platform:junit-platform-launcher:1.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-engine:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.14.3" + testImplementation "org.mockito:mockito-junit-jupiter:3.12.4" + testImplementation "org.assertj:assertj-core:3.27.7" + testImplementation "com.github.xgouchet.Elmyr:core:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:inject:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.4" + testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" testImplementation("org.mockito:mockito-inline:5.2.0") - unmock 'org.robolectric:android-all:4.4_r1-robolectric-r2' + unmock 'org.robolectric:android-all:4.4_r1-robolectric-1' detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8" detektPlugins "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.8" } diff --git a/packages/core/android/gradle/wrapper/gradle-wrapper.properties b/packages/core/android/gradle/wrapper/gradle-wrapper.properties index 27313fbc8..29a0dd9af 100644 --- a/packages/core/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/core/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/internal-testing-tools/android/build.gradle b/packages/internal-testing-tools/android/build.gradle index d3763a64a..5ad0fc200 100644 --- a/packages/internal-testing-tools/android/build.gradle +++ b/packages/internal-testing-tools/android/build.gradle @@ -14,12 +14,12 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.6.1" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8" - classpath 'com.github.bjoernq:unmockplugin:0.7.9' + classpath 'com.github.bjoernq:unmockplugin:0.9.0' } } @@ -189,19 +189,19 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(path: ':datadog_mobile-react-native') implementation "com.datadoghq:dd-sdk-android-core" - implementation "com.google.code.gson:gson:2.10.0" - - testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.6.2" - testImplementation "org.mockito:mockito-junit-jupiter:3.4.6" - testImplementation "org.assertj:assertj-core:3.18.1" - testImplementation "com.github.xgouchet.Elmyr:core:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:inject:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1" - testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0" + implementation "com.google.code.gson:gson:2.13.2" + + testImplementation "org.junit.platform:junit-platform-launcher:1.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-engine:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.14.3" + testImplementation "org.mockito:mockito-junit-jupiter:3.12.4" + testImplementation "org.assertj:assertj-core:3.27.7" + testImplementation "com.github.xgouchet.Elmyr:core:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:inject:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.4" + testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8" diff --git a/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties b/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties index 27313fbc8..29a0dd9af 100644 --- a/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/react-native-session-replay/android/build.gradle b/packages/react-native-session-replay/android/build.gradle index 8c497076a..b68477788 100644 --- a/packages/react-native-session-replay/android/build.gradle +++ b/packages/react-native-session-replay/android/build.gradle @@ -14,12 +14,12 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.6.1" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8" - classpath 'com.github.bjoernq:unmockplugin:0.7.9' + classpath 'com.github.bjoernq:unmockplugin:0.9.0' } } @@ -216,27 +216,27 @@ dependencies { api "com.facebook.react:react-android:$reactNativeVersion" } implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "com.datadoghq:dd-sdk-android-session-replay:3.5.0" - implementation "com.datadoghq:dd-sdk-android-internal:3.5.0" + implementation "com.datadoghq:dd-sdk-android-session-replay:3.7.0" + implementation "com.datadoghq:dd-sdk-android-internal:3.7.0" implementation project(path: ':datadog_mobile-react-native') - testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.6.2" - testImplementation "org.mockito:mockito-junit-jupiter:3.4.6" - testImplementation "org.assertj:assertj-core:3.18.1" - testImplementation "com.github.xgouchet.Elmyr:core:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:inject:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1" - testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0" + testImplementation "org.junit.platform:junit-platform-launcher:1.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-engine:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.14.3" + testImplementation "org.mockito:mockito-junit-jupiter:3.12.4" + testImplementation "org.assertj:assertj-core:3.27.7" + testImplementation "com.github.xgouchet.Elmyr:core:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:inject:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.4" + testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8" detektPlugins "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.8" - unmock 'org.robolectric:android-all:4.4_r1-robolectric-r2' + unmock 'org.robolectric:android-all:4.4_r1-robolectric-1' } tasks.withType(Test) { diff --git a/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties index 27313fbc8..29a0dd9af 100644 --- a/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/react-native-webview/android/build.gradle b/packages/react-native-webview/android/build.gradle index 7381b968f..8f95a9d46 100644 --- a/packages/react-native-webview/android/build.gradle +++ b/packages/react-native-webview/android/build.gradle @@ -12,12 +12,12 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.6.1" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8" - classpath 'com.github.bjoernq:unmockplugin:0.7.9' + classpath 'com.github.bjoernq:unmockplugin:0.9.0' } } @@ -196,30 +196,30 @@ dependencies { implementation "com.facebook.react:react-android:$reactNativeVersion" } - implementation "com.datadoghq:dd-sdk-android-webview:3.5.0" + implementation "com.datadoghq:dd-sdk-android-webview:3.7.0" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(path: ':datadog_mobile-react-native') implementation project(path: ':react-native-webview') - testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.6.2" - testImplementation "org.mockito:mockito-junit-jupiter:3.4.6" - testImplementation "org.assertj:assertj-core:3.18.1" - testImplementation "com.github.xgouchet.Elmyr:core:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:inject:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.1" - testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1" - testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0" + testImplementation "org.junit.platform:junit-platform-launcher:1.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-engine:5.14.3" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.14.3" + testImplementation "org.mockito:mockito-junit-jupiter:3.12.4" + testImplementation "org.assertj:assertj-core:3.27.7" + testImplementation "com.github.xgouchet.Elmyr:core:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:inject:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.4" + testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.4" + testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" testImplementation 'org.json:json:20160810' detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8" detektPlugins "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.8" - unmock 'org.robolectric:android-all:4.4_r1-robolectric-r2' + unmock 'org.robolectric:android-all:4.4_r1-robolectric-1' } tasks.withType(Test) { diff --git a/packages/react-native-webview/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-webview/android/gradle/wrapper/gradle-wrapper.properties index 8cb39cca3..12e846cd2 100644 --- a/packages/react-native-webview/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/react-native-webview/android/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-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-all.zip