Have Jib CLI return correct version

GoogleContainerTools · Mar 18, 2021 · 73ecf6d · 73ecf6d
1 parent 5cfc9c8
commit 73ecf6d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/jib-cli/build.gradle b/jib-cli/build.gradle
@@ -15,6 +15,21 @@ application {
   mainClassName = cliMainClass
 }
 
+sourceSets.main.java.srcDirs += ["${buildDir}/generated-src"]
+
+tasks.register('generateSources', Copy) {
+  // to re-run the task whenever the file changes
+  inputs.file 'gradle.properties'
+
+  from fileTree('src/java-templates')
+  into "${buildDir}/generated-src"
+
+  rename('\\.template$', '')
+  expand(['version': "${version}"])
+}
+
+compileJava.source generateSources
+
 dependencies {
   implementation project(':jib-core')
   implementation project(':jib-plugins-common')

diff --git a/...ogle/cloud/tools/jib/cli/VersionInfo.java → ...d/tools/jib/cli/VersionInfo.java.template b/...ogle/cloud/tools/jib/cli/VersionInfo.java → ...d/tools/jib/cli/VersionInfo.java.template
@@ -27,6 +27,6 @@ public String[] getVersion() throws Exception {
   }
 
   public static String getVersionSimple() {
-    return "preview";
+    return "${version}";
   }
 }