From 3e7e1f1e64bdeb23a51b5155faea975beec0bc84 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 6 Aug 2020 14:59:31 -0700 Subject: [PATCH] fix: fix dependencies.properties resource file creation during deployment (#1163) * fix: immediately populate the dependencies.properties resource file * fix: generate the dependences.properties file as a generated-resource and include in sources --- build.gradle | 10 ---------- gax/build.gradle | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index c11765dee..82aa3732b 100644 --- a/build.gradle +++ b/build.gradle @@ -41,14 +41,6 @@ googleJavaFormat { exclude 'bazel*/**' } -task generateProjectProperties { - ext.outputFile = file("gax/src/main/resources/dependencies.properties") - outputs.file(outputFile) - doLast { - outputFile.text = "version.gax=${project.version}" - } -} - // google-java-format-gradle-plugin:0.8 does not work with Java 1.7. verifyGoogleJavaFormat.onlyIf { JavaVersion.current().isJava8Compatible() } @@ -93,7 +85,6 @@ allprojects { } } test.dependsOn verifyLicense - test.dependsOn generateProjectProperties gradle.projectsEvaluated { tasks.withType(JavaCompile) { @@ -174,7 +165,6 @@ subprojects { // ---------- task sourcesJar(type: Jar, dependsOn: classes) { - dependsOn generateProjectProperties classifier = 'sources' from sourceSets.main.allSource, sourceSets.test.allSource, sourceSets.main.resources.srcDirs diff --git a/gax/build.gradle b/gax/build.gradle index 9493ea62e..fa0db6d39 100644 --- a/gax/build.gradle +++ b/gax/build.gradle @@ -23,6 +23,16 @@ dependencies { shadowNoGuava libraries['maven.com_google_guava_guava'] } +ext.generatedOutputDir = file("${buildDir}/generated-resources") +task generateProjectProperties { + ext.outputFile = file("${generatedOutputDir}/dependencies.properties") + outputs.file(outputFile) + doLast { + outputFile.text = "version.gax=${project.version}" + } +} +sourceSets.main.output.dir generatedOutputDir, builtBy: generateProjectProperties + jar { manifest { attributes 'Specification-Title': project.name,