Skip to content

chore(deps): update gradle non-major dependencies #1259

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

Draft
dd-octo-sts wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

chore(deps): update gradle non-major dependencies #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions benchmarks/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0")
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.9.0")
// Required for compile-time access to Datadog.getInstance() required by BenchmarkVitalsModuleImpl
implementation("com.datadoghq:dd-sdk-android-core:3.8.0")
implementation("com.datadoghq:dd-sdk-android-core:3.9.0")
}
2 changes: 1 addition & 1 deletion benchmarks/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions example-new-architecture/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion example-new-architecture/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
50 changes: 25 additions & 25 deletions packages/core/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -194,16 +194,16 @@ 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.8.0") {
implementation("com.datadoghq:dd-sdk-android-rum:3.9.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"
// dd-sdk-android requires androidx.core:core and androidx.core:core-ktx
// From 3.8.0, it uses 1.15.0, which requires compileSdk 35.
// However, React Native versions below 0.76.0 use compileSdk 34,
Expand All @@ -220,29 +220,29 @@ dependencies {
}
}
} else {
implementation "com.datadoghq:dd-sdk-android-rum:3.8.0"
implementation "com.datadoghq:dd-sdk-android-rum:3.9.0"
}
implementation "com.datadoghq:dd-sdk-android-logs:3.8.0"
implementation "com.datadoghq:dd-sdk-android-trace:3.8.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.8.0"
implementation "com.datadoghq:dd-sdk-android-ndk:3.8.0"
implementation "com.datadoghq:dd-sdk-android-flags:3.8.0"
implementation "com.google.code.gson:gson:2.11.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.9.0"
implementation "com.datadoghq:dd-sdk-android-trace:3.9.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.9.0"
implementation "com.datadoghq:dd-sdk-android-ndk:3.9.0"
implementation "com.datadoghq:dd-sdk-android-flags:3.9.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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
32 changes: 16 additions & 16 deletions packages/internal-testing-tools/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down Expand Up @@ -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.11.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"
Expand Down
2 changes: 1 addition & 1 deletion packages/internal-testing-tools/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
34 changes: 17 additions & 17 deletions packages/react-native-session-replay/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down Expand Up @@ -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.8.0"
implementation "com.datadoghq:dd-sdk-android-internal:3.8.0"
implementation "com.datadoghq:dd-sdk-android-session-replay:3.9.0"
implementation "com.datadoghq:dd-sdk-android-internal:3.9.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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-session-replay/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
32 changes: 16 additions & 16 deletions packages/react-native-webview/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down Expand Up @@ -196,30 +196,30 @@ dependencies {
implementation "com.facebook.react:react-android:$reactNativeVersion"
}

implementation "com.datadoghq:dd-sdk-android-webview:3.8.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.9.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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-webview/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading