Auto generate version file

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Signed-off-by: Hiroshi Miura <miurahr@linux.com>

diff --git a/.gitignore b/.gitignore
index d50b818..c5f5641 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ build
 /.idea
 /.jacocoverage
 .run
+
+# auto generated file
+dictzip-cli/src/main/resources/org/dict/zip/Version.properties
\ No newline at end of file

diff --git a/build.gradle b/build.gradle
index 39d47fb..5b42cf8 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,18 @@ if (versionDetails().isCleanTag) {
     version = versionDetails().lastTag.substring(1) + '-' + versionDetails().commitDistance + '-' + versionDetails().gitHash + '-SNAPSHOT'
 }
 
+def props = project.file("dictzip-cli/src/main/resources/org/dict/zip/Version.properties")
+task writeVersionFile {
+    def folder = props.getParentFile()
+    if (!folder.exists()) {
+        folder.mkdirs()
+    }
+    props.delete()
+    props.text = "version=" + project.version
+}
+
+jar.dependsOn("writeVersionFile")
+
 // common settings
 subprojects {
     apply plugin: 'jacoco'

diff --git a/dictzip-cli/src/main/java/org/dict/zip/cli/AppConsts.java b/dictzip-cli/src/main/java/org/dict/zip/cli/AppConsts.java
index 43905c5..f40315b 100644 (file)
--- a/dictzip-cli/src/main/java/org/dict/zip/cli/AppConsts.java
+++ b/dictzip-cli/src/main/java/org/dict/zip/cli/AppConsts.java
@@ -29,32 +29,21 @@ import java.util.ResourceBundle;
 public final class AppConsts {
     static final String VERSION = ResourceBundle.getBundle("org/dict/zip/Version")
             .getString("version");
-    static final String UPDATE = ResourceBundle.getBundle("org/dict/zip/Version")
-            .getString("update");
-    static final String REVISION = ResourceBundle.getBundle("org/dict/zip/Version")
-            .getString("revision");
-
     static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
             .getBundle("org/dict/zip/cli/Bundle", Locale.getDefault());
 
     static final String NAME = RESOURCE_BUNDLE.getString("application.name");
     static final String BRANDING = "";
-    static final String YEAR = "2016";
+    static final String YEAR = "2016-2022";
     static final String AUTHORS = "Hiroshi Miura";
-    static final String LICENSE = "GPLv2+";
 
     private static String getString(final String key) {
         return RESOURCE_BUNDLE.getString(key);
     }
 
     static String getNameAndVersion() {
-        if (UPDATE != null && !UPDATE.equals("0")) {
-            return MessageFormat.format(getString("app-version-template-pretty-update"),
-                    getApplicationName(), VERSION, UPDATE);
-        } else {
-            return MessageFormat.format(getString("app-version-template-pretty"),
-                    getApplicationName(), VERSION);
-        }
+        return MessageFormat.format(getString("app-version-template-pretty"),
+                getApplicationName(), VERSION);
     }
 
     static String getApplicationName() {

diff --git a/dictzip-cli/src/main/resources/org/dict/zip/Version.properties b/dictzip-cli/src/main/resources/org/dict/zip/Version.properties
deleted file mode 100644 (file)
index 892d322..0000000
--- a/dictzip-cli/src/main/resources/org/dict/zip/Version.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#/*
-# * Copyright (C) 2016 Hiroshi Miura
-# *
-# * This program is free software; you can redistribute it and/or
-# * modify it under the terms of the GNU General Public License
-# * as published by the Free Software Foundation; either version 2
-# * of the License, or (at your option) any later version.
-# *
-# * This program is distributed in the hope that it will be useful,
-# * but WITHOUT ANY WARRANTY; without even the implied warranty of
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# * GNU General Public License for more details.
-# *
-# * You should have received a copy of the GNU General Public License
-# * along with this program; if not, write to the Free Software
-# * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# *
-# * Linking this library statically or dynamically with other modules is
-# * making a combined work based on this library.  Thus, the terms and
-# * conditions of the GNU General Public License cover the whole
-# * combination.
-# *
-# * As a special exception, the copyright holders of this library give you
-# * permission to link this library with independent modules to produce an
-# * executable, regardless of the license terms of these independent
-# * modules, and to copy and distribute the resulting executable under
-# * terms of your choice, provided that you also meet, for each linked
-# * independent module, the terms and conditions of the license of that
-# * module.  An independent module is a module which is not derived from
-# * or based on this library.  If you modify this library, you may extend
-# * this exception to your version of the library, but you are not
-# * obligated to do so.  If you do not wish to do so, delete this
-# * exception statement from your version.
-# */
-
-version=0.6
-update=1
-revision=