diff --git a/build.gradle b/build.gradle index 0dc2f79..e5b44a0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT' apply plugin: 'java' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 repositories { mavenCentral() diff --git a/butterflycore/build.gradle b/butterflycore/build.gradle index ee0795f..1b3b3d5 100644 --- a/butterflycore/build.gradle +++ b/butterflycore/build.gradle @@ -4,7 +4,7 @@ version '1.0-SNAPSHOT' apply plugin: 'java' apply plugin: 'kotlin' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 repositories { mavenCentral() diff --git a/butterflydao/build.gradle b/butterflydao/build.gradle index d16f4bf..0d07920 100644 --- a/butterflydao/build.gradle +++ b/butterflydao/build.gradle @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT' apply plugin: 'java' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 repositories { mavenCentral() diff --git a/butterflymodel/build.gradle b/butterflymodel/build.gradle index ceeda6d..21a68e5 100644 --- a/butterflymodel/build.gradle +++ b/butterflymodel/build.gradle @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT' apply plugin: 'java' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 repositories { mavenCentral() diff --git a/butterflyserver/build.gradle b/butterflyserver/build.gradle index f69d83c..ce168b7 100644 --- a/butterflyserver/build.gradle +++ b/butterflyserver/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'java' apply plugin: 'application' apply plugin: 'com.github.johnrengelman.shadow' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 mainClassName = "com.buttongames.butterflyserver.Main" @@ -53,7 +53,7 @@ buildscript { } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' + classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0' } } diff --git a/butterflyserver/src/main/resources/butterflyserver.properties b/butterflyserver/src/main/resources/butterflyserver.properties index 706dca1..de18b53 100644 --- a/butterflyserver/src/main/resources/butterflyserver.properties +++ b/butterflyserver/src/main/resources/butterflyserver.properties @@ -2,4 +2,4 @@ server.port = 80 server.maintenance = false server.paselienable = true -server.forceextrastage = false \ No newline at end of file +server.forceextrastage = true \ No newline at end of file diff --git a/butterflywebui/build.gradle b/butterflywebui/build.gradle index 94e2a02..eac705c 100644 --- a/butterflywebui/build.gradle +++ b/butterflywebui/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'java' apply plugin: 'application' apply plugin: 'com.github.johnrengelman.shadow' -sourceCompatibility = 1.8 +sourceCompatibility = 1.11 mainClassName = "com.buttongames.butterflywebui.Main" @@ -53,6 +53,6 @@ buildscript { } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' + classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 92ffca8..004598c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e90edb6..3a51a75 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 04 17:50:58 CST 2019 +#Sat Sep 28 22:27:21 CDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip diff --git a/gradlew b/gradlew index 30945ed..cccdd3d 100644 --- a/gradlew +++ b/gradlew @@ -133,7 +133,7 @@ if $cygwin ; then CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a eventCondition + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` else eval `echo args$i`="\"$arg\""