Refactor to be more in line with a standard Gradle project structure

release/build_nomulus_for_env.sh

@@ -31,29 +31,25 @@ if [ "${environment}" == tool ]
 then
   mkdir -p "${dest}"
 
-  cd gradle
   ./gradlew clean :core:nomulus \
     -PmavenUrl=https://"${gcs_prefix}"/maven \
     -PpluginsUrl=https://"${gcs_prefix}"/plugins
-  cd -
 
-  mv gradle/core/build/libs/nomulus.jar "${dest}"
+  mv core/build/libs/nomulus.jar "${dest}"
 else
   dest="${dest}/$1"
   mkdir -p "${dest}"
 
-  cd gradle
   ./gradlew clean stage -Penvironment="${environment}" \
     -PmavenUrl=https://"${gcs_prefix}"/maven \
     -PpluginsUrl=https://"${gcs_prefix}"/plugins
-  cd -
 
   for service in default pubapi backend tools
   do
-    mv gradle/services/"${service}"/build/staged-app "${dest}/${service}"
+    mv services/"${service}"/build/staged-app "${dest}/${service}"
   done
 
-  mv gradle/core/build/resources/main/google/registry/env/common/META-INF \
+  mv core/build/resources/main/google/registry/env/common/META-INF \
     "${dest}/META-INF"
 
   cd "${dest}"

release/cloudbuild-nomulus.yaml

@@ -27,7 +27,6 @@ steps:
 # Run tests
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['./gradlew', 'test', '-PskipDockerIncompatibleTests=true']
-  dir: 'gradle'
 # Build the tool binary.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['release/build_nomulus_for_env.sh', 'tool', 'output']

release/cloudbuild-proxy.yaml

@@ -26,11 +26,10 @@ steps:
   - ':proxy:deployJar'
   - '-PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven'
   - '-PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins'
-  dir: 'gradle'
 # Build the docker image.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['docker', 'build', '--tag', 'gcr.io/${PROJECT_ID}/proxy:${TAG_NAME}', '.']
-  dir: 'gradle/proxy'
+  dir: 'proxy'
 # Push the image. We can't let Cloud Build's default processing do that for us
 # because we need to push the image before we can sign it in the following
 # step.

release/cloudbuild-release.yaml

@@ -64,7 +64,7 @@ steps:
       --format='get(digest)' --filter='tags = ${TAG_NAME}')
     base_digest=$(gcloud container images list-tags gcr.io/${PROJECT_ID}/base \
       --format='get(digest)' --filter='tags = ${TAG_NAME}')
-    sed -i s%distroless/java%${PROJECT_ID}/base@$base_digest% gradle/proxy/Dockerfile
+    sed -i s%distroless/java%${PROJECT_ID}/base@$base_digest% proxy/Dockerfile
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-proxy.yaml
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-nomulus.yaml
     sed -i s/GCP_PROJECT/${PROJECT_ID}/ java/google/registry/proxy/kubernetes/proxy-*.yaml
@@ -75,7 +75,7 @@ steps:
   args:
   - -c
   - |
-    gradle_url=$(grep distributionUrl gradle/gradle/wrapper/gradle-wrapper.properties \
+    gradle_url=$(grep distributionUrl gradle/wrapper/gradle-wrapper.properties \
       | awk -F = '{print $2}' | sed 's/\\//g')
     gradle_bin=$(basename $gradle_url)
     gcs_loc="domain-registry-maven-repository/gradle"
@@ -94,7 +94,7 @@ steps:
     fi
     rm ${gradle_bin}
     sed -i s%services.gradle.org/distributions%storage.googleapis.com/${gcs_loc}% \
-      gradle/gradle/wrapper/gradle-wrapper.properties
+      gradle/wrapper/gradle-wrapper.properties
 # Check out the release repo.
 - name: 'gcr.io/cloud-builders/gcloud'
   args: ['source', 'repos', 'clone', 'nomulus-release']