Merge pull request #178 from cashapp/lkerford.0426.buildChanges

Fixing build to work for internal release
cashapp · Apr 26, 2021 · 33bbb3c · 33bbb3c
2 parents 55d0c5d + efbd265
commit 33bbb3c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -91,6 +91,4 @@ subprojects {
       attributes.attribute(Usage.USAGE_ATTRIBUTE, this@subprojects.objects.named(Usage::class, Usage.JAVA_RUNTIME))
     }
   }
-
-  apply(from = "$rootDir/gradle-mvn-publish.gradle")
 }
diff --git a/client-misk-dynamodb/build.gradle.kts b/client-misk-dynamodb/build.gradle.kts
@@ -45,3 +45,5 @@ afterEvaluate {
 if (rootProject.file("hooks.gradle").exists()) {
   apply(from = rootProject.file("hooks.gradle"))
 }
+
+apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/client-misk-hibernate/build.gradle.kts b/client-misk-hibernate/build.gradle.kts
@@ -42,3 +42,5 @@ afterEvaluate {
 if (rootProject.file("hooks.gradle").exists()) {
   apply(from = rootProject.file("hooks.gradle"))
 }
+
+apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/client-misk-testing/build.gradle.kts b/client-misk-testing/build.gradle.kts
@@ -23,3 +23,5 @@ afterEvaluate {
 if (rootProject.file("hooks.gradle").exists()) {
   apply(from = rootProject.file("hooks.gradle"))
 }
+
+apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/client-misk/build.gradle.kts b/client-misk/build.gradle.kts
@@ -45,3 +45,5 @@ afterEvaluate {
 if (rootProject.file("hooks.gradle").exists()) {
   apply(from = rootProject.file("hooks.gradle"))
 }
+
+apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -49,3 +49,5 @@ afterEvaluate {
 if (rootProject.file("hooks.gradle").exists()) {
   apply(from = rootProject.file("hooks.gradle"))
 }
+
+apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -87,3 +87,5 @@ val shadowJar by tasks.getting(com.github.jengelman.gradle.plugins.shadow.tasks.
 if (rootProject.file("hooks.gradle").exists()) {
   apply(from = rootProject.file("hooks.gradle"))
 }
+
+apply(from = "$rootDir/gradle-mvn-publish.gradle")
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,6 +91,4 @@ subprojects { @@
           attributes.attribute(Usage.USAGE_ATTRIBUTE, this@subprojects.objects.named(Usage::class, Usage.JAVA_RUNTIME))
         }
       }
-      apply(from = "$rootDir/gradle-mvn-publish.gradle")
     }