Skip to content

Commit

Permalink
TS-34214 Rework
Browse files Browse the repository at this point in the history
  • Loading branch information
@DreierF
DreierF committed May 3, 2023
1 parent a875032 commit 85bf9be
Show file tree
Hide file tree
Showing 22 changed files with 43 additions and 42 deletions.
8 changes: 4 additions & 4 deletions agent/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id("com.teamscale.java-convention")
com.teamscale.`java-convention`
alias(libs.plugins.markdownToPdf)
application

// we don't want to cause conflicts between our dependencies and the target application
// since the agent will be loaded with the same class loader as the profiled application
// so we use the shadow plugin to relocate our dependencies
id("com.teamscale.shadow-convention")
id("com.teamscale.coverage")
id("com.teamscale.publish")
com.teamscale.`shadow-convention`
com.teamscale.coverage
com.teamscale.publish
}

publishAs {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com.teamscale.system-test-convention.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.java-convention")
com.teamscale.`java-convention`
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion common-system-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
`java-library`
id("com.teamscale.java-convention")
com.teamscale.`java-convention`
// we do not enable code coverage recording for the system tests as we already need our agent attached
// it would conflict with JaCoCo's
}
Expand Down
9 changes: 5 additions & 4 deletions impacted-test-engine/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
plugins {
`java-library`
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
id("com.teamscale.shadow-convention")
id("com.teamscale.publish")
com.teamscale.`java-convention`
com.teamscale.`java-convention`
com.teamscale.coverage
com.teamscale.`shadow-convention`
com.teamscale.publish
}

publishAs {
Expand Down
6 changes: 3 additions & 3 deletions report-generator/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
`java-library`
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
id("com.teamscale.publish")
com.teamscale.`java-convention`
com.teamscale.coverage
com.teamscale.publish
}

publishAs {
Expand Down
4 changes: 2 additions & 2 deletions sample-app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ buildscript {

plugins {
application
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
com.teamscale.`java-convention`
com.teamscale.coverage
alias(libs.plugins.gitProperties)
}

Expand Down
2 changes: 1 addition & 1 deletion sample-debugging-app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.java-convention")
com.teamscale.`java-convention`
}

version = "unspecified"
Expand Down
2 changes: 1 addition & 1 deletion system-tests/artifactory-git-properties-detection/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion system-tests/debug-logging-default-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion system-tests/debug-logging-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion system-tests/default-excludes-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion system-tests/http-redirect-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

tasks.test {
Expand Down
4 changes: 2 additions & 2 deletions system-tests/http-server-shutdown/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.teamscale.system-test-convention")
id("com.teamscale.coverage")
com.teamscale.`system-test-convention`
com.teamscale.coverage
}

tasks.test {
Expand Down
4 changes: 2 additions & 2 deletions system-tests/junit-run-listener-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.teamscale.system-test-convention")
id("com.teamscale.coverage")
com.teamscale.`system-test-convention`
com.teamscale.coverage
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion system-tests/multiple-agents-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

val jacocoAgent by configurations.creating
Expand Down
2 changes: 1 addition & 1 deletion system-tests/tia-client-test/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion system-tests/tia-client-tia-mode-http/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.teamscale.system-test-convention")
com.teamscale.`system-test-convention`
}

tasks.test {
Expand Down
4 changes: 2 additions & 2 deletions system-tests/tia-maven/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.teamscale.system-test-convention")
id("com.teamscale.coverage")
com.teamscale.`system-test-convention`
com.teamscale.coverage
}

tasks.test {
Expand Down
6 changes: 3 additions & 3 deletions teamscale-client/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
`java-library`
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
id("com.teamscale.publish")
com.teamscale.`java-convention`
com.teamscale.coverage
com.teamscale.publish
}

publishAs {
Expand Down
6 changes: 3 additions & 3 deletions teamscale-gradle-plugin/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
`java-gradle-plugin`
`kotlin-dsl`
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
id("com.teamscale.publish")
com.teamscale.`java-convention`
com.teamscale.coverage
com.teamscale.publish
alias(libs.plugins.pluginPublish)
}

Expand Down
6 changes: 3 additions & 3 deletions tia-client/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
`java-library`
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
id("com.teamscale.publish")
com.teamscale.`java-convention`
com.teamscale.coverage
com.teamscale.publish
}

publishAs {
Expand Down
6 changes: 3 additions & 3 deletions tia-runlisteners/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
`java-library`
id("com.teamscale.java-convention")
id("com.teamscale.coverage")
id("com.teamscale.publish")
com.teamscale.`java-convention`
com.teamscale.coverage
com.teamscale.publish
}

publishAs {
Expand Down

0 comments on commit 85bf9be

Please sign in to comment.