Skip to content

Commit db58605

Browse files
amarzialiamarziali
committed
Move scala modules
1 parent 3101a85 commit db58605

File tree

67 files changed

+55
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+55
-55
lines changed

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ dependencies {
106106
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
107107
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
108108
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
109-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
110-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
111-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
109+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
110+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
111+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
112112

113113
baseTestImplementation project(':utils:test-utils')
114114
baseTestImplementation libs.scala211

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ dependencies {
6666
testImplementation libs.scala213
6767
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
6868
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
69-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
69+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
7070
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
71-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
71+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
7272

7373
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
7474
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'

‎dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ dependencies {
5353
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
5454
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
5555
testImplementation project(':dd-java-agent:instrumentation:pekko:pekko-concurrent-1.0')
56-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
57-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
58-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
56+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
57+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
58+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
5959

6060
baseTestImplementation libs.scala212
6161
baseTestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.12', version: '1.0.0'

‎dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ dependencies {
3535
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
3636
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
3737
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
38-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
39-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
40-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
38+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
39+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
40+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
4141

4242
testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
4343

‎dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ dependencies {
4040
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
4141
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
4242
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
43-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
44-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
45-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
43+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
44+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
45+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
4646

4747
testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
4848

‎dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ dependencies {
4141
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
4242
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
4343
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
44-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
45-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
46-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
44+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
45+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
46+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
4747

4848
testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
4949

‎dd-java-agent/instrumentation/play/play-2.3/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ dependencies {
4343

4444
testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8')
4545
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
46-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
47-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
48-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
46+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
47+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
48+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
4949
testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.9'
5050
testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.9'
5151
testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.9') {

‎dd-java-agent/instrumentation/play/play-2.4/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ dependencies {
8484
testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1')
8585
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
8686
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
87-
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent')
88-
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
89-
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
87+
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
88+
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
89+
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
9090

9191
// Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5
9292
testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'

‎dd-java-agent/instrumentation/play/play-2.6/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ dependencies {
114114
testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1')
115115
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
116116
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
117-
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent')
118-
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
119-
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
117+
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
118+
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
119+
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
120120

121121
latestDepTestRuntimeOnly sourceSets.baseTest.output
122122
latestDepTestImplementation libs.scala213

‎dd-java-agent/instrumentation/rediscala-1.8/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ addTestSuiteForDir('latestDepTest', 'test')
5050
dependencies {
5151
compileOnly group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
5252

53-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
54-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
53+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
54+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
5555

5656
testImplementation group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
5757
testImplementation group: 'com.github.codemonstur', name: 'embedded-redis', version: '1.4.3'

0 commit comments

Comments
 (0)