Skip to content

Commit 97b209b

Browse files
amarzialiamarziali
committed
Exclude akka http build outside the CI
1 parent 2fe6aa2 commit 97b209b

File tree

1 file changed

+65
-67
lines changed
  • dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6

1 file changed

+65
-67
lines changed

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

Lines changed: 65 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,90 +3,88 @@ ext {
33
minJavaVersionForTests = JavaVersion.VERSION_11
44
}
55

6-
apply from: "$rootDir/gradle/java.gradle"
7-
apply plugin: 'scala'
8-
apply plugin: 'call-site-instrumentation'
6+
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
97

8+
apply from: "$rootDir/gradle/java.gradle"
9+
apply plugin: 'scala'
10+
apply plugin: 'call-site-instrumentation'
1011

11-
muzzle {
12-
pass {
13-
group = 'com.typesafe.akka'
14-
module = 'akka-http_2.13'
15-
versions = "[10.6.0,)"
16-
javaVersion = "11"
17-
extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0'
1812

19-
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
13+
muzzle {
14+
pass {
15+
group = 'com.typesafe.akka'
16+
module = 'akka-http_2.13'
17+
versions = "[10.6.0,)"
18+
javaVersion = "11"
19+
extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0'
20+
2021
extraRepository('akka', "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure")
21-
} else {
22-
extraRepository('akka', 'https://repo.akka.io/maven')
22+
assertInverse = true
2323
}
2424

25-
assertInverse = true
2625
}
2726

28-
}
29-
30-
repositories {
31-
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
32-
maven {
33-
url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure"
34-
}
35-
} else {
36-
maven {
37-
url "https://repo.akka.io/maven"
27+
repositories {
28+
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
29+
maven {
30+
url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure"
31+
}
32+
} else {
33+
maven {
34+
url "https://repo.akka.io/maven"
35+
}
3836
}
3937
}
40-
}
4138

42-
addTestSuiteForDir('latestDepTest', 'test')
39+
addTestSuiteForDir('latestDepTest', 'test')
4340

44-
[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each {
45-
it.configure {
46-
setJavaVersion(it, 11)
47-
sourceCompatibility = JavaVersion.VERSION_1_8
48-
targetCompatibility = JavaVersion.VERSION_1_8
41+
[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each {
42+
it.configure {
43+
setJavaVersion(it, 11)
44+
sourceCompatibility = JavaVersion.VERSION_1_8
45+
targetCompatibility = JavaVersion.VERSION_1_8
46+
}
4947
}
50-
}
5148

52-
compileTestGroovy {
53-
javaLauncher = getJavaLauncherFor(11)
54-
dependsOn compileTestScala
55-
classpath += files(compileTestScala.destinationDirectory)
56-
}
49+
compileTestGroovy {
50+
javaLauncher = getJavaLauncherFor(11)
51+
dependsOn compileTestScala
52+
classpath += files(compileTestScala.destinationDirectory)
53+
}
5754

58-
compileLatestDepTestGroovy {
59-
javaLauncher = getJavaLauncherFor(11)
60-
dependsOn compileLatestDepTestScala
61-
classpath += files(compileLatestDepTestScala.destinationDirectory)
62-
}
55+
compileLatestDepTestGroovy {
56+
javaLauncher = getJavaLauncherFor(11)
57+
dependsOn compileLatestDepTestScala
58+
classpath += files(compileLatestDepTestScala.destinationDirectory)
59+
}
6360

64-
dependencies {
65-
main_java11CompileOnly libs.scala213
66-
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
67-
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'
61+
dependencies {
62+
main_java11CompileOnly libs.scala213
63+
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
64+
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'
6865

69-
//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
70-
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
71-
testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0'
72-
testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0'
73-
testImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '10.6.0'
74-
testImplementation libs.scala213
75-
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
76-
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
77-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
78-
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
79-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
66+
//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
67+
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
68+
testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0'
69+
testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0'
70+
testImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '10.6.0'
71+
testImplementation libs.scala213
72+
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
73+
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
74+
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
75+
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
76+
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
8077

81-
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
82-
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'
83-
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-pki_2.13', version: '+'
84-
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-protobuf-v3_2.13', version: '+'
85-
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '+'
86-
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '+'
87-
latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.0.+'
88-
}
78+
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
79+
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'
80+
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-pki_2.13', version: '+'
81+
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-protobuf-v3_2.13', version: '+'
82+
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '+'
83+
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '+'
84+
latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.0.+'
85+
}
8986

90-
configurations.getByName("latestDepTestRuntimeClasspath").resolutionStrategy {
91-
it.force libs.slf4j
87+
configurations.getByName("latestDepTestRuntimeClasspath").resolutionStrategy {
88+
it.force libs.slf4j
89+
}
9290
}

0 commit comments

Comments
 (0)