Skip to content

Commit 29d9765

Browse files
committed
Replace Configuration.files API with Configuration.incoming
1 parent fcf91c6 commit 29d9765

File tree

7 files changed

+26
-7
lines changed

7 files changed

+26
-7
lines changed

buildSrc/src/main/kotlin/com/datadog/gradle/plugin/transdeps/GenerateTransitiveDependenciesTask.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package com.datadog.gradle.plugin.transdeps
88

99
import org.gradle.api.DefaultTask
1010
import org.gradle.api.artifacts.Configuration
11-
import org.gradle.api.artifacts.ProjectDependency
11+
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
1212
import org.gradle.api.tasks.Input
1313
import org.gradle.api.tasks.OutputFile
1414
import org.gradle.api.tasks.TaskAction
@@ -47,10 +47,12 @@ open class GenerateTransitiveDependenciesTask : DefaultTask() {
4747
check(configuration.isCanBeResolved) { "$configuration cannot be resolved" }
4848

4949
val sortedArtifacts = if (sortByName) {
50-
configuration.files {
51-
// ProjectDependency (i.e. local modules) don't have a file associated
52-
it !is ProjectDependency
53-
}.sortedBy { it.absolutePath }
50+
configuration.incoming
51+
.artifactView {
52+
componentFilter { it !is ProjectComponentIdentifier }
53+
}
54+
.files
55+
.sortedBy { it.absolutePath }
5456
} else {
5557
configuration.sortedBy { -it.length() }
5658
}

features/dd-sdk-android-trace-otel/transitiveDependencies

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ Dependencies List
33
androidx.annotation:annotation-jvm:1.9.1 : 59 Kb
44
io.opentelemetry:opentelemetry-api:1.4.0 : 78 Kb
55
io.opentelemetry:opentelemetry-context:1.4.0 : 42 Kb
6+
io.opentracing:opentracing-api:0.32.0 : 18 Kb
7+
io.opentracing:opentracing-noop:0.32.0 : 10 Kb
8+
io.opentracing:opentracing-util:0.32.0 : 10 Kb
69
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
710
org.jetbrains:annotations:13.0 : 17 Kb
811

9-
Total transitive dependencies size : 1876 Kb
12+
Total transitive dependencies size : 1915 Kb
1013

integrations/dd-sdk-android-glide/transitiveDependencies

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ com.github.bumptech.glide:glide:4.11.0 : 614 Kb
4242
com.github.bumptech.glide:okhttp3-integration:4.11.0 : 8 Kb
4343
com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
4444
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
45+
io.opentracing:opentracing-api:0.32.0 : 18 Kb
4546
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
4647
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
4748
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
4849
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 : 19 Kb
4950
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 : 1442 Kb
5051
org.jetbrains:annotations:13.0 : 17 Kb
5152

52-
Total transitive dependencies size : 7 Mb
53+
Total transitive dependencies size : 8 Mb
5354

integrations/dd-sdk-android-okhttp-otel/transitiveDependencies

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ Dependencies List
22

33
com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
44
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
5+
io.opentelemetry:opentelemetry-api:1.4.0 : 78 Kb
6+
io.opentelemetry:opentelemetry-context:1.4.0 : 42 Kb
7+
io.opentracing:opentracing-api:0.32.0 : 18 Kb
8+
io.opentracing:opentracing-noop:0.32.0 : 10 Kb
9+
io.opentracing:opentracing-util:0.32.0 : 10 Kb
510
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
611
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
712
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb

integrations/dd-sdk-android-okhttp/transitiveDependencies

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ androidx.annotation:annotation-jvm:1.9.1 : 59 Kb
44
com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
55
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
66
io.opentracing:opentracing-api:0.32.0 : 18 Kb
7+
io.opentracing:opentracing-noop:0.32.0 : 10 Kb
8+
io.opentracing:opentracing-util:0.32.0 : 10 Kb
79
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
810
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
911
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb

integrations/dd-sdk-android-sqldelight/transitiveDependencies

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
66
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
77
com.squareup.sqldelight:android-driver:1.5.5 : 23 Kb
88
com.squareup.sqldelight:runtime-jvm:1.5.5 : 44 Kb
9+
io.opentracing:opentracing-api:0.32.0 : 18 Kb
10+
io.opentracing:opentracing-noop:0.32.0 : 10 Kb
11+
io.opentracing:opentracing-util:0.32.0 : 10 Kb
912
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
1013
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
1114
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb

integrations/dd-sdk-android-trace-coroutines/transitiveDependencies

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Dependencies List
22

3+
io.opentracing:opentracing-api:0.32.0 : 18 Kb
4+
io.opentracing:opentracing-noop:0.32.0 : 10 Kb
5+
io.opentracing:opentracing-util:0.32.0 : 10 Kb
36
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
47
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2 : 1635 Kb
58
org.jetbrains:annotations:13.0 : 17 Kb

0 commit comments

Comments
 (0)