Skip to content
Merged
3 changes: 3 additions & 0 deletions dd-sdk-android-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ dependencies {
}
}
testImplementation(testFixtures(project(":dd-sdk-android-internal")))
testImplementation(libs.gson)
testImplementation(libs.okHttp)
testImplementation(libs.androidXWorkManager)
testImplementation(libs.bundles.jUnit5)
testImplementation(libs.bundles.testTools)
unmock(libs.robolectric)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ internal class Configurator :
// IO
forge.addFactory(BatchForgeryFactory())
forge.addFactory(PayloadDecorationForgeryFactory())
forge.addFactory(WorkerParametersForgeryFactory())
// forge.addFactory(WorkerParametersForgeryFactory())

// NDK Crash
forge.addFactory(NdkCrashLogForgeryFactory())
Expand Down
55 changes: 49 additions & 6 deletions dd-sdk-android-dependencies/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,61 @@ dependencies {
}

tasks.shadowJar {
archiveClassifier.set("")
archiveClassifier.set("all")

relocate("org.jctools", "cloud.flashcat.shaded.jctools")
relocate("com.google.re2j", "cloud.flashcat.shaded.re2j")
}

tasks.named<Jar>("jar") {
enabled = false
dependsOn(tasks.shadowJar)
from(zipTree(tasks.shadowJar.flatMap { it.archiveFile })) {
// Exclude manifest from shadowJar to avoid conflicts with main jar's manifest
exclude("META-INF/MANIFEST.MF")
}
}

val shadowJar = tasks.shadowJar
artifacts {
add("apiElements", shadowJar)
add("runtimeElements", shadowJar)
tasks.register("assembleDebug") {
dependsOn("assemble")
}

tasks.register("assembleRelease") {
dependsOn("assemble")
}

// Shadow tasks to satisfy Android aggregation tasks
tasks.register("testDebugUnitTest") {
dependsOn("test")
}

tasks.register("testReleaseUnitTest") {
dependsOn("test")
}

tasks.register("lintRelease") {
// No-op for this Java library
}

tasks.register("checkDependencyLicenses") {
// No-op for this Java library
}

tasks.register("checkApiSurfaceChanges") {
// No-op for this Java library
}

tasks.register("checkCompilerMetadataChanges") {
// No-op for this Java library
}

tasks.register("checkTransitiveDependenciesList") {
// No-op for this Java library
}

tasks.register("koverXmlReportRelease") {
// No-op or depends on koverXmlReport if applied
}

tasks.register("printDetektClasspath") {
// No-op
}
10 changes: 10 additions & 0 deletions dd-sdk-android-internal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ android {
testFixtures {
enable = true
}

testOptions {
unitTests.all {
it.exclude("com/datadog/android/internal/utils/ThrowableExtTest*")
it.exclude("com/datadog/android/rum/DdRumContentProviderTest*")
it.exclude("com/datadog/internal/thread/NamedRunnableTest*")
}
}
}

dependencies {
Expand All @@ -60,6 +68,8 @@ dependencies {
}
testImplementation(libs.bundles.jUnit5)
testImplementation(libs.bundles.testTools)
testImplementation(libs.robolectric)
testImplementation(libs.androidXTestCore)
testFixturesImplementation(libs.kotlin)
testFixturesImplementation(libs.bundles.jUnit5)
testFixturesImplementation(libs.bundles.testTools)
Expand Down
5 changes: 4 additions & 1 deletion features/dd-sdk-android-flags-noop/transitiveDependencies
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
Dependencies List

androidx.annotation:annotation-jvm:1.9.1 : 59 Kb
androidx.collection:collection:1.2.0 : 39 Kb
com.google.code.gson:gson:2.8.9 : 252 Kb
com.squareup.okhttp3:okhttp:4.9.0 : 772 Kb
com.squareup.okio:okio:2.8.0 : 237 Kb
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
org.jetbrains:annotations:13.0 : 17 Kb

Total transitive dependencies size : 2035 Kb
Total transitive dependencies size : 3 Mb

Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Dependencies List

dev.openfeature:kotlin-sdk-android:0.6.2 : 118 Kb
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 : 963 b
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 : 969 b
org.jetbrains.kotlin:kotlin-stdlib:2.1.21 : 1683 Kb
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 : 1514 Kb
org.jetbrains:annotations:23.0.0 : 28 Kb

Total transitive dependencies size : 1830 Kb
Total transitive dependencies size : 3 Mb

10 changes: 4 additions & 6 deletions features/dd-sdk-android-flags-openfeature/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,8 @@ androidLibraryConfig()
junitConfig()
javadocConfig()
dependencyUpdateConfig()
/*
// publishingConfig(
// "OpenFeature Provider integration for the Datadog Feature Flags " +
// "library for Android applications."
// )
*/
publishingConfig(
"OpenFeature Provider integration for the Datadog Feature Flags " +
"library for Android applications."
)
detektCustomConfig()
16 changes: 10 additions & 6 deletions features/dd-sdk-android-flags/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ apply(from = "generate_flags_models.gradle.kts")

android {
namespace = "com.datadog.android.flags"

testOptions {
unitTests.all {
it.exclude("com/datadog/android/flags/internal/net/PrecomputedAssignmentsRequestFactoryTest*")
}
}
}

dependencies {
Expand Down Expand Up @@ -85,10 +91,8 @@ androidLibraryConfig()
junitConfig()
javadocConfig()
dependencyUpdateConfig()
/*
// publishingConfig(
// "The Feature Flags integration feature to use with the Datadog monitoring " +
// "library for Android applications."
// )
*/
publishingConfig(
"The Feature Flags integration feature to use with the Datadog monitoring " +
"library for Android applications."
)
detektCustomConfig()
4 changes: 2 additions & 2 deletions features/dd-sdk-android-profiling/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ dependencies {
api(project(":dd-sdk-android-core"))
implementation(project(":dd-sdk-android-internal"))
implementation(libs.kotlin)
implementation("androidx.core:core:1.15.0")
implementation("androidx.core:core-ktx:1.15.0")
implementation(libs.androidx.core.v1150)
implementation(libs.androidx.core.ktx.v1150)
// implementation(libs.androidXCore)
// implementation(libs.androidXCoreKtx)
compileOnly(libs.gson)
Expand Down
1 change: 1 addition & 0 deletions features/dd-sdk-android-rum/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ dependencies {
}

testImplementation(libs.bundles.jUnit5)
testImplementation(libs.gson)
testImplementation(libs.bundles.testTools)
testImplementation(libs.okHttp)
testImplementation(libs.okHttpMock)
Expand Down
1 change: 1 addition & 0 deletions features/dd-sdk-android-trace/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ dependencies {
ksp(project(":tools:noopfactory"))

testImplementation(testFixtures(project(":dd-sdk-android-core")))
testImplementation(libs.gson)
testImplementation(libs.okHttp)
testImplementation(libs.bundles.jUnit5)
testImplementation(libs.bundles.testTools)
Expand Down
1 change: 1 addition & 0 deletions features/dd-sdk-android-webview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dependencies {
}
testImplementation(testFixtures(project(":dd-sdk-android-core")))
testImplementation(testFixtures(project(":features:dd-sdk-android-rum")))
testImplementation(libs.gson)
testImplementation(libs.okHttp)
testImplementation(libs.bundles.jUnit5)
testImplementation(libs.bundles.testTools)
Expand Down
4 changes: 4 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[versions]
# Commons
apollo = "4.3.3"
core = "1.15.0"
coreKtx = "1.15.0"
cronetApi = "141.7340.3"
cronetPlayServices = "18.1.1"
gson = "2.8.9"
Expand Down Expand Up @@ -113,6 +115,8 @@ material3Android = "1.1.2"
# Classpaths
# Gradle version catalog doesn't allow names to end with plugin, that is why strange names
androidToolsGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidToolsPlugin" }
androidx-core-ktx-v1150 = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
androidx-core-v1150 = { module = "androidx.core:core", version.ref = "core" }
apolloRuntime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" }
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlinSPGradlePlugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "kotlinSP" }
Expand Down
1 change: 1 addition & 0 deletions integrations/dd-sdk-android-fresco/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ dependencies {
}
}
testImplementation(libs.bundles.jUnit5)
testImplementation(libs.bundles.fresco)
testImplementation(libs.bundles.testTools)
testImplementation(libs.okHttpMock)
}
Expand Down
Loading