Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`kotlin-dsl`
alias(libs.plugins.versionsGradlePlugin)
alias(libs.plugins.ktlintGradlePlugin)
}

Expand Down Expand Up @@ -42,7 +41,6 @@ dependencies {
// would put two AGP/KGP resolutions on the same classpath.
compileOnly(libs.kotlinGradlePluginApi)
compileOnly(libs.androidToolsGradlePluginApi)
compileOnly(libs.versionsGradlePlugin)
compileOnly(libs.dokkaGradlePlugin)
compileOnly(libs.detektGradlePlugin)
compileOnly(libs.ktlintGradlePlugin)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package com.datadog.gradle.plugin.config

import com.datadog.gradle.config.androidLibraryConfig
import com.datadog.gradle.config.dependencyUpdateConfig
import com.datadog.gradle.config.javadocConfig
import com.datadog.gradle.config.junitConfig
import com.datadog.gradle.config.kotlinConfig
Expand Down Expand Up @@ -51,11 +50,6 @@ abstract class DatadogBuildExtension @Inject constructor(
project.javadocConfig()
}

/** Restricts the dependency-updates report to stable releases. */
fun applyDependencyUpdateConfig() {
project.dependencyUpdateConfig()
}

/** Declares the Maven publication (POM metadata, sources/javadoc jars) and its signing. */
@JvmOverloads
fun applyPublishingConfig(
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ plugins {
alias(libs.plugins.androidLibraryPlugin) apply false
alias(libs.plugins.kotlinAndroidPlugin) apply false
alias(libs.plugins.dokkaGradlePlugin) apply false
Comment thread
0xnm marked this conversation as resolved.
alias(libs.plugins.versionsGradlePlugin) apply false
alias(libs.plugins.detektGradlePlugin) apply false
}

Expand Down
2 changes: 0 additions & 2 deletions dd-sdk-android-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -167,6 +166,5 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig("Datadog monitoring library for Android applications.")
}
2 changes: 0 additions & 2 deletions dd-sdk-android-internal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -82,7 +81,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"Internal library to be used by the Datadog SDK modules."
)
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-flags-openfeature/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -75,7 +74,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"OpenFeature Provider integration for the Datadog Feature Flags " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-flags/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -85,7 +84,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The Feature Flags integration feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-logs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -92,7 +91,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The Logs feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-ndk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -105,7 +104,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"An NDK integration to use with the Datadog monitoring library for Android applications."
)
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-profiling/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -127,7 +126,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The Profiling feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-rum-debug-widget/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -70,7 +69,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The RUM Debug Widget feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-rum/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -188,7 +187,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The RUM feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -80,7 +79,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"Session Replay Extension Support for Jetpack Compose."
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("binary-compatibility-validator")

// Tests
Expand Down Expand Up @@ -65,7 +64,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"Session Replay Extension Support for Material UI components."
)
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-session-replay/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -127,7 +126,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The Session Replay feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-trace-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -62,7 +61,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"Tracing engine API specification used for internal module communication."
)
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-trace-internal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -124,7 +123,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"Internal APM support library for Android applications."
)
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-trace-otel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -86,7 +85,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The tracing library for Android, providing OpenTelemetry compatibility."
)
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-trace/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -108,7 +107,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The Tracing feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
2 changes: 0 additions & 2 deletions features/dd-sdk-android-webview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -75,7 +74,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"The WebView integration feature to use with the Datadog monitoring " +
"library for Android applications."
Expand Down
3 changes: 0 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ unmock = "0.9.0"
robolectric = "4.4_r1-robolectric-r2"
androidLint = "31.0.2"

versionsGradlePlugin = "0.46.0"
nexusPublishGradlePlugin = "2.0.0"
datadogPlugin = "1.27.0"

Expand Down Expand Up @@ -114,7 +113,6 @@ material3Android = "1.1.2"
androidToolsGradlePluginApi = { module = "com.android.tools.build:gradle-api", version.ref = "androidToolsPlugin" }
apolloRuntime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" }
kotlinGradlePluginApi = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
versionsGradlePlugin = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsGradlePlugin" }
dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
unmockGradlePlugin = { module = "com.github.bjoernq:unmockplugin", version.ref = "unmock" }
Expand Down Expand Up @@ -374,7 +372,6 @@ traceCore = [
]

[plugins]
versionsGradlePlugin = { id = "com.github.ben-manes.versions", version.ref = "versionsGradlePlugin" }
nexusPublishGradlePlugin = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublishGradlePlugin" }
datadogGradlePlugin = { id = "com.datadoghq.dd-sdk-android-gradle-plugin", version.ref = "datadogPlugin" }
composeCompilerPlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
Expand Down
1 change: 0 additions & 1 deletion integrations/dd-sdk-android-apollo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
id("org.jetbrains.dokka")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down
2 changes: 0 additions & 2 deletions integrations/dd-sdk-android-coil/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -62,7 +61,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"A Coil integration to use with the Datadog monitoring library for Android applications."
)
Expand Down
2 changes: 0 additions & 2 deletions integrations/dd-sdk-android-coil3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
id("org.jetbrains.dokka-javadoc")

// Analysis tools
id("com.github.ben-manes.versions")
id("detekt-conventions")

// Tests
Expand Down Expand Up @@ -63,7 +62,6 @@ datadogBuild {
applyAndroidLibraryConfig()
applyJunitConfig()
applyJavadocConfig()
applyDependencyUpdateConfig()
applyPublishingConfig(
"A Coil 3 integration to use with the Datadog monitoring library for Android applications."
)
Expand Down
Loading
Loading