Merge pull request #91 from thinreports/build/release-0.12.0

hidakatsuya · web-flow · commit d07a8e7c0585 · 2021-01-16T12:56:36.000+09:00
Release v0.12.0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v1.3.0
+        uses: actions/setup-java@v1.4.3
         with:
           java-version: 7
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-## master
+## master (Unreleased)
+
+## 0.12.0
+
+### Enhancements
 
  * Adds CTRL+Mouse wheel zoom #85 [@rhiroshi]
 
diff --git a/app/editor/version.js b/app/editor/version.js
@@ -27,7 +27,7 @@ thin.Version.MAJOR = 0;
 /**
  * @type {number}
  */
-thin.Version.MINOR = 11;
+thin.Version.MINOR = 12;
 
 
 /**
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thinreports-editor",
   "productName": "Thinreports Editor",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "license": "GPL-3.0",
   "description": "Designer for Thinreports",
   "main": "main.js"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "thinreports-editor",`
`3`	`3`	`"productName": "Thinreports Editor",`
`4`		`- "version": "0.11.0",`
	`4`	`+ "version": "0.12.0",`
`5`	`5`	`"license": "GPL-3.0",`
`6`	`6`	`"description": "Designer for Thinreports",`
`7`	`7`	`"main": "main.js"`