Skip to content

Commit 7fd28dc

Browse files
amarzialiamarziali
committed
scala-promise-common
1 parent ec5442a commit 7fd28dc

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ tasks.named("latestDepTest", Test) {
3333
}
3434

3535
sourceSets {
36-
test.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.groovy
36+
test.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.groovy
3737
test.groovy.srcDir sourceSets.latestDepForkedTest.groovy
38-
latestDepTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.groovy
39-
latestDepForkedTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.groovy
38+
latestDepTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.groovy
39+
latestDepForkedTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.groovy
4040

41-
test.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.scala
42-
latestDepTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.scala
43-
latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.scala
41+
test.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.scala
42+
latestDepTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.scala
43+
latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.scala
4444
}
4545

4646
tasks.named("compileTestGroovy", GroovyCompile) {
@@ -70,11 +70,11 @@ tasks.withType(ScalaCompile).configureEach {
7070
dependencies {
7171
// first version that works with the tests on JDK11 (without dependency problems):
7272
compileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.10.7'
73-
implementation project(':dd-java-agent:instrumentation:scala:scala-promise')
73+
implementation project(':dd-java-agent:instrumentation:scala:scala-promise-common')
7474

7575
testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.10.7'
76-
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise')
76+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise-common')
7777

7878
latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.12.+'
79-
latestDepTestImplementation project(':dd-java-agent:instrumentation:scala:scala-promise')
79+
latestDepTestImplementation project(':dd-java-agent:instrumentation:scala:scala-promise-common')
8080
}

‎dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ tasks.named("latestDepTest", Test) {
3333
}
3434

3535
sourceSets {
36-
test.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.groovy
36+
test.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.groovy
3737
test.groovy.srcDir sourceSets.latestDepForkedTest.groovy
38-
latestDepTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.groovy
39-
latestDepForkedTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.groovy
38+
latestDepTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.groovy
39+
latestDepForkedTest.groovy.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.groovy
4040

41-
test.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.scala
42-
latestDepTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.scala
43-
latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise').sourceSets.test.scala
41+
test.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.scala
42+
latestDepTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.scala
43+
latestDepForkedTest.scala.srcDir project(':dd-java-agent:instrumentation:scala:scala-promise-common').sourceSets.test.scala
4444
}
4545

4646
tasks.named("compileTestGroovy", GroovyCompile) {
@@ -65,11 +65,11 @@ tasks.withType(ScalaCompile).configureEach {
6565

6666
dependencies {
6767
compileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.13.0'
68-
implementation project(':dd-java-agent:instrumentation:scala:scala-promise')
68+
implementation project(':dd-java-agent:instrumentation:scala:scala-promise-common')
6969

7070
testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.13.0'
71-
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise')
71+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise-common')
7272

7373
latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.+' // scala-lang 3.x requires scala 3.x compiler
74-
latestDepTestImplementation project(':dd-java-agent:instrumentation:scala:scala-promise')
74+
latestDepTestImplementation project(':dd-java-agent:instrumentation:scala:scala-promise-common')
7575
}

dd-java-agent/instrumentation/scala/scala-promise/build.gradle renamed to dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/build.gradle

File renamed without changes.

dd-java-agent/instrumentation/scala/scala-promise/gradle.lockfile renamed to dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/scala/scala-promise/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java renamed to dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java

File renamed without changes.

dd-java-agent/instrumentation/scala/scala-promise/src/test/groovy/ScalaPromiseTestBase.groovy renamed to dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/groovy/ScalaPromiseTestBase.groovy

File renamed without changes.

dd-java-agent/instrumentation/scala/scala-promise/src/test/groovy/ScalaUnitPromiseTestBase.groovy renamed to dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/groovy/ScalaUnitPromiseTestBase.groovy

File renamed without changes.

dd-java-agent/instrumentation/scala/scala-promise/src/test/scala/PromiseUtils.scala renamed to dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/scala/PromiseUtils.scala

File renamed without changes.

0 commit comments

Comments
 (0)