From 8d9bdef4b7eb29c4758d7d04a3b4ef8a12126bae Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 10 Jul 2017 16:12:15 -0700 Subject: [PATCH] Rename build.gradle scripts to match project name. This will help in finding build scripts inside the IDE. --- .circleci/config.yml | 6 +++--- ...uild.gradle => dd-java-agent-ittests.gradle} | 0 .../{build.gradle => dd-java-agent.gradle} | 0 ...build.gradle => dd-trace-annotations.gradle} | 0 .../{build.gradle => async-tracing.gradle} | 0 ...ld.gradle => dropwizard-mongo-client.gradle} | 0 .../{build.gradle => spring-boot-jdbc.gradle} | 0 build.gradle => dd-trace-java.gradle | 0 dd-trace/{build.gradle => dd-trace.gradle} | 0 settings.gradle | 17 +++++++++-------- 10 files changed, 12 insertions(+), 11 deletions(-) rename dd-java-agent-ittests/{build.gradle => dd-java-agent-ittests.gradle} (100%) rename dd-java-agent/{build.gradle => dd-java-agent.gradle} (100%) rename dd-trace-annotations/{build.gradle => dd-trace-annotations.gradle} (100%) rename dd-trace-examples/async-tracing/{build.gradle => async-tracing.gradle} (100%) rename dd-trace-examples/dropwizard-mongo-client/{build.gradle => dropwizard-mongo-client.gradle} (100%) rename dd-trace-examples/spring-boot-jdbc/{build.gradle => spring-boot-jdbc.gradle} (100%) rename build.gradle => dd-trace-java.gradle (100%) rename dd-trace/{build.gradle => dd-trace.gradle} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 05c4a686a0..72c96e5548 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,16 +9,16 @@ jobs: - checkout - restore_cache: - key: dd-trace-java-{{ checksum "build.gradle" }}-{{ checksum "dd-java-agent/build.gradle" }}-{{ checksum "dd-trace/build.gradle" }} + key: dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ checksum "dd-java-agent/dd-java-agent.gradle" }}-{{ checksum "dd-trace/dd-trace.gradle" }} - run: name: Run Tests - command: ./gradlew clean shadowJar check + command: ./gradlew clean shadowJar check --parallel - save_cache: paths: - ~/.gradle - key: dd-trace-java-{{ checksum "build.gradle" }}-{{ checksum "dd-java-agent/build.gradle" }}-{{ checksum "dd-trace/build.gradle" }} + key: dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ checksum "dd-java-agent/dd-java-agent.gradle" }}-{{ checksum "dd-trace/dd-trace.gradle" }} - store_test_results: path: dd-java-agent/build/test-results diff --git a/dd-java-agent-ittests/build.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle similarity index 100% rename from dd-java-agent-ittests/build.gradle rename to dd-java-agent-ittests/dd-java-agent-ittests.gradle diff --git a/dd-java-agent/build.gradle b/dd-java-agent/dd-java-agent.gradle similarity index 100% rename from dd-java-agent/build.gradle rename to dd-java-agent/dd-java-agent.gradle diff --git a/dd-trace-annotations/build.gradle b/dd-trace-annotations/dd-trace-annotations.gradle similarity index 100% rename from dd-trace-annotations/build.gradle rename to dd-trace-annotations/dd-trace-annotations.gradle diff --git a/dd-trace-examples/async-tracing/build.gradle b/dd-trace-examples/async-tracing/async-tracing.gradle similarity index 100% rename from dd-trace-examples/async-tracing/build.gradle rename to dd-trace-examples/async-tracing/async-tracing.gradle diff --git a/dd-trace-examples/dropwizard-mongo-client/build.gradle b/dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle similarity index 100% rename from dd-trace-examples/dropwizard-mongo-client/build.gradle rename to dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle diff --git a/dd-trace-examples/spring-boot-jdbc/build.gradle b/dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle similarity index 100% rename from dd-trace-examples/spring-boot-jdbc/build.gradle rename to dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle diff --git a/build.gradle b/dd-trace-java.gradle similarity index 100% rename from build.gradle rename to dd-trace-java.gradle diff --git a/dd-trace/build.gradle b/dd-trace/dd-trace.gradle similarity index 100% rename from dd-trace/build.gradle rename to dd-trace/dd-trace.gradle diff --git a/settings.gradle b/settings.gradle index 760270f6e9..4dbeabab43 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ rootProject.name = 'dd-trace-java' + include ':dd-trace' include ':dd-java-agent' include ':dd-java-agent-ittests' @@ -8,11 +9,11 @@ include ':dd-trace-examples:spring-boot-jdbc' include ':dd-trace-examples' include ':dd-trace-annotations' -project(':dd-trace').projectDir = "$rootDir/dd-trace" as File -project(':dd-java-agent').projectDir = "$rootDir/dd-java-agent" as File -project(':dd-java-agent-ittests').projectDir = "$rootDir/dd-java-agent-ittests" as File -project(':dd-trace-examples:async-tracing').projectDir = "$rootDir/dd-trace-examples/async-tracing" as File -project(':dd-trace-examples:dropwizard-mongo-client').projectDir = "$rootDir/dd-trace-examples/dropwizard-mongo-client" as File -project(':dd-trace-examples:spring-boot-jdbc').projectDir = "$rootDir/dd-trace-examples/spring-boot-jdbc" as File -project(':dd-trace-examples').projectDir = "$rootDir/dd-trace-examples" as File -project(':dd-trace-annotations').projectDir = "$rootDir/dd-trace-annotations" as File \ No newline at end of file +def setBuildFile(project) { + project.buildFileName = "${project.name}.gradle" + project.children.each { + setBuildFile(it) + } +} + +setBuildFile(rootProject)