diff --git a/build.gradle b/build.gradle
index 30172ea..4fab010 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,34 +1,14 @@
group 'ninja.javafx'
-version '0.9-SNAPSHOT'
-
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'no.tornado:fxlauncher-gradle-plugin:1.0.12'
- }
-}
+version '0.9.1-SNAPSHOT'
apply plugin: 'java'
apply plugin: 'groovy'
apply plugin: 'application'
apply plugin: 'idea'
-apply plugin: 'no.tornado.fxlauncher'
sourceCompatibility = 1.8
mainClassName = 'ninja.javafx.smartcsv.fx.SmartCSV'
-def fxlauncherPathName = getBuildDir().absolutePath + File.separatorChar + 'fxlauncher' + File.separatorChar
-
-fxlauncher {
- applicationVendor 'Andreas Billmann (andreas.billmann@javafx.ninja)'
- applicationUrl 'http://javafx.ninja/SmartCSV.fx/'
- applicationMainClass mainClassName
- acceptDowngrade false
- cacheDir 'USERLIB/SmartCSV.fx'
-}
-
repositories {
mavenCentral()
jcenter()
@@ -37,37 +17,21 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
- compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.10'
- compile group: 'org.springframework', name:'spring-context', version: '4.3.7.RELEASE'
+ compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.15'
+ compile group: 'org.springframework', name:'spring-context', version: '5.0.5.RELEASE'
compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
compile group: 'commons-validator', name: 'commons-validator', version: '1.6'
- compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '8.15'
- compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-5'
- compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.7.22-4'
- compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-5'
- compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.12'
- compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.8.1'
- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.1'
- compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.7-M3'
+ compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '9.1.2'
+ compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-9.1.2'
+ compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '2.0.26-9.1.2'
+ compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-9.1.2'
+ compile group: 'org.controlsfx', name: 'controlsfx', version: '9.0.0'
+ compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
+ compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.9.1'
+ compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.9.1'
+ compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.9.0'
}
task wrapper(type: Wrapper) {
gradleVersion = '3.1' //version required
-}
-
-task buildSmartCSV(dependsOn: ['clean','embedApplicationManifest']) << {
- def file = new File(fxlauncherPathName + 'fxlauncher.jar')
- file.renameTo(fxlauncherPathName + 'SmartCSV.fx.jar')
-}
-
-task modifyAppXML(dependsOn: 'generateApplicationManifest') << {
- String contents = new File( fxlauncherPathName + 'app.xml' ).getText( 'UTF-8' )
- contents = contents.replaceAll( 'Updating...', 'Updating SmartCSV.fx ...' )
- contents = contents.replaceAll( '-fx-spacing: 10; -fx-padding: 25;', '-fx-spacing: 10; -fx-padding: 25;-fx-font-size: 0.9em;' )
- new File( fxlauncherPathName + 'app.xml' ).write( contents, 'UTF-8' )
-}
-
-embedApplicationManifest.dependsOn modifyAppXML
-
-defaultTasks 'buildSmartCSV'
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml b/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
index a1865b5..78cd94f 100644
--- a/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
@@ -50,7 +50,6 @@
-
@@ -75,8 +74,6 @@
-
-
@@ -92,7 +89,7 @@
-
+
diff --git a/src/main/resources/ninja/javafx/smartcsv/fx/application.properties b/src/main/resources/ninja/javafx/smartcsv/fx/application.properties
index 5075cf8..867333c 100644
--- a/src/main/resources/ninja/javafx/smartcsv/fx/application.properties
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/application.properties
@@ -1,5 +1,5 @@
application.name = SmartCSV.fx
-application.version = 0.9
+application.version = 0.9.1
# fxml views
fxml.smartcvs.view = /ninja/javafx/smartcsv/fx/smartcsv.fxml