Merge branch 'release/2.4.0'

Author: bivab

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.3.0
+current_version = 2.4.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>\w+))?
 tag = False
 commit = True

.travis.yml

@@ -10,7 +10,7 @@ notification:
 language: clojure
 lein: lein
 before_install:
-- rvm install 2.3.0
+- rvm install 2.4.0
 - gem install travis-custom-deploy
 before_script:
 - sh -e /etc/init.d/xvfb start
@@ -24,7 +24,7 @@ script:
   - lein launch4j
 
 after_success:
-- travis-custom-deploy sftp target/mincer-2.3.0-standalone.jar target/mincer-2.3.0.exe
+- travis-custom-deploy sftp target/mincer-2.4.0-standalone.jar target/mincer-2.4.0.exe
 env:
   global:
   - DISPLAY=:99.0

README.md

@@ -17,7 +17,7 @@ Mincer supports two usage modes: batch/CLI and GUI modes.
 To start the graphical user-interface run the provided jar without arguments:
 
 ```
-$ java -jar mincer-2.3.0-standalone.jar
+$ java -jar mincer-2.4.0-standalone.jar
 ```
 
 ### CLI

config.xml

@@ -2,8 +2,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>target/mincer-2.3.0-standalone.jar</jar>
-  <outfile>target/mincer-2.3.0.exe</outfile>
+  <jar>target/mincer-2.4.0-standalone.jar</jar>
+  <outfile>target/mincer-2.4.0.exe</outfile>
   <errTitle></errTitle>
   <priority>normal</priority>
   <downloadUrl>http://java.com/download</downloadUrl>
@@ -23,15 +23,15 @@
   </jre>
   <versionInfo>
     <fileVersion>0.0.0.1</fileVersion>
-    <txtFileVersion>2.3.0-dev</txtFileVersion>
+    <txtFileVersion>2.4.0-dev</txtFileVersion>
     <fileDescription>mincer</fileDescription>
     <copyright>ISC</copyright>
     <productVersion>0.0.0.1</productVersion>
-    <txtProductVersion>2.3.0-dev</txtProductVersion>
+    <txtProductVersion>2.4.0-dev</txtProductVersion>
     <productName>mincer</productName>
     <companyName></companyName>
     <internalName>mincer</internalName>
-    <originalFilename>mincer-2.3.0.exe</originalFilename>
+    <originalFilename>mincer-2.4.0.exe</originalFilename>
   </versionInfo>
   <messages>
     <startupErr>Startup Error</startupErr>

project.clj

@@ -1,4 +1,4 @@
-(defproject mincer "2.3.0"
+(defproject mincer "2.4.0"
   :description "Tool to create a SQLite database from PlüS module tree and data XML files."
   :url "https://github.com/plues/mincer"
   :license {:name "Eclipse Public License"
@@ -17,5 +17,5 @@
             [lein-launch4j "0.1.2"]]
   :launch4j-config-file "config.xml"
   :launch4j-install-dir ~(System/getenv "LAUNCH4J_INSTALL_DIR")
-  :main mincer.core
-  :aot [mincer.core])
+  :profiles {:uberjar {:aot :all}}
+  :main mincer.core)

src/mincer/db.clj

@@ -5,7 +5,7 @@
     [clojure.java.jdbc :refer [with-db-transaction]]
     [clojure.tools.logging :as log]))
 
-(def mincer-version "2.3.0") ; updated with bumpversion
+(def mincer-version "2.4.0") ; updated with bumpversion
 
 (defn now [] (new java.util.Date))
 
@@ -142,7 +142,8 @@
                                "CREATE INDEX session_group_id ON sessions(group_id)"
 
                                 (jdbc/create-table-ddl :log
-                                                      [[:session_id :integer "NOT NULL" "REFERENCES sessions"]
+                                                      [[:id :integer "PRIMARY KEY" "AUTOINCREMENT"]
+                                                       [:session_id :integer "NOT NULL" "REFERENCES sessions"]
                                                        [:srcDay :string]
                                                        [:srcTime :integer]
                                                        [:targetDay :string]
@@ -151,7 +152,7 @@
                                "CREATE INDEX log_session_id ON log(session_id)"])
 
   (jdbc/insert! db-con :info {:key "schema_version"
-                              :value (str "v7.0")})
+                              :value (str "v7.1")})
   (jdbc/insert! db-con :info {:key "generator"
                               :value (str "mincer" "-" mincer-version)})
   (jdbc/insert! db-con :info {:key "generated"

src/mincer/ui.clj

@@ -171,7 +171,7 @@
                    [(label ::mincer)
                     (label :icon logo)
                     (label ::file-select)
-                    (label "2.3.0") ; managed by bumpversion
+                    (label "2.4.0") ; managed by bumpversion
                     meta-button
                     meta-text
                     source-button