Updating libraries

waicool20 · Sep 20, 2019 · 5126e91 · 5126e91
1 parent 5f92f85
commit 5126e91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,8 +24,9 @@ import java.nio.file.Paths
 import java.nio.file.StandardOpenOption
 
 buildscript {
-    ext.kotlin_version = '1.3.0'
-    ext.jackson_version = '2.9.7'
+    ext.kotlin_version = '1.3.50'
+    ext.jackson_version = '2.9.9'
+
     repositories {
         mavenCentral()
     }
@@ -35,7 +36,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.github.johnrengelman.shadow' version '4.0.2'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
 }
 
 apply plugin: 'java'
@@ -73,7 +74,7 @@ dependencies {
     compile group: 'org.ini4j', name: 'ini4j', version: '0.5.4'
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile group: 'no.tornado', name: 'tornadofx', version: '1.7.17'
+    compile group: 'no.tornado', name: 'tornadofx', version: '1.7.19'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: jackson_version
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jackson_version
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jackson_version
@@ -90,6 +91,8 @@ dependencies {
     compileOnly(group: "com.sikulix", name: "sikulixapi", version: "1.1.3-SNAPSHOT") {
         exclude group: "com.sikulix"
         exclude group: 'com.github.vidstige'
+        exclude group: 'com.github.tulskiy'
+        exclude group: 'com.melloware'
     }
 
     compile group: 'net.java.dev.jna', name: 'jna', version: '5.2.0'

diff --git a/waicoolUtils b/waicoolUtils
+4 −4		build.gradle
+13 −20		src/main/kotlin/com/waicool20/waicoolutils/CollectionsAsync.kt
+39 −3		src/main/kotlin/com/waicool20/waicoolutils/ImageUtils.kt
+36 −0		src/main/kotlin/com/waicool20/waicoolutils/javafx/TextFieldExtensions.kt
+10 −3		src/main/kotlin/com/waicool20/waicoolutils/streams/TextAreaOutputStream.kt