Simplify directory/module structure (#77)

* Move things up a directory

* Scripted mass update

find -type f -name "*.gradle" | xargs sed -i 's/:java-agent:/:/g'

* Remove plugin version now that it's in root module

* Update java-agent and instrumentation configs

* Misc
This commit is contained in:
Trask Stalnaker 2020-01-22 13:55:47 -08:00 committed by GitHub
parent b6b425c8a9
commit 819ca7c256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
843 changed files with 302 additions and 312 deletions

View File

@ -8,7 +8,7 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies {
compile project(':trace-api')
compile deps.opentelemetryApi
compile(project(path: ':java-agent:opentelemetry-sdk', configuration: 'shadow'))
compile(project(path: ':opentelemetry-sdk', configuration: 'shadow'))
compile deps.slf4j
compile group: 'org.slf4j', name: 'slf4j-simple', version: versions.slf4j
// ^ Generally a bad idea for libraries, but we're shadowing.

View File

@ -13,19 +13,19 @@ configurations {
}
dependencies {
compile(project(':java-agent:agent-bootstrap')) {
compile(project(':agent-bootstrap')) {
// This only needs to exist in the bootstrap, not the instrumentation jar.
exclude group: 'org.slf4j', module: 'slf4j-simple'
}
compile deps.opentelemetryApi
compile(project(path: ':java-agent:opentelemetry-sdk', configuration: 'shadow'))
compile(project(path: ':opentelemetry-sdk', configuration: 'shadow'))
compile group: 'com.blogspot.mydailyjava', name: 'weak-lock-free', version: '0.15'
compile deps.bytebuddy
compile deps.bytebuddyagent
annotationProcessor deps.autoservice
implementation deps.autoservice
testCompile project(':java-agent:testing')
testCompile project(':testing')
testCompile project(':utils:gc-utils')
instrumentationMuzzle sourceSets.main.output

View File

@ -1,7 +1,7 @@
dependencies {
compile project(':trace-api')
compile project(':java-agent:agent-bootstrap')
compile project(':java-agent:benchmark-integration')
compile project(':agent-bootstrap')
compile project(':benchmark-integration')
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120'
compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'

View File

@ -21,8 +21,8 @@ dependencies {
play "com.typesafe.play:filters-helpers_$scalaVersion:$playVersion"
play project(':trace-api')
play project(':java-agent:agent-bootstrap')
play project(':java-agent:benchmark-integration')
play project(':agent-bootstrap')
play project(':benchmark-integration')
}
repositories {

View File

@ -67,5 +67,5 @@ tasks.register("jmhAgent", JavaExec) {
dependsOn project.tasks.jmhCompileGeneratedClasses
}
tasks.jmhAgent.dependsOn project(':java-agent').shadowJar
tasks.jmhAgent.dependsOn(':java-agent:shadowJar')

Some files were not shown because too many files have changed in this diff Show More