Leahnaya/butterfly
1
0
Fork 0
mirror of https://github.com/skogaby/butterfly.git synced 2026-03-21 18:04:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Gradle 5.6.2, Java 11

Browse Source
This commit is contained in:
skogaby 2019-09-28 23:12:15 -05:00
parent 64e526410d
commit 20e3667b47
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
apply plugin: 'java'
sourceCompatibility = 1.8
sourceCompatibility = 1.11
repositories {
mavenCentral()

2
butterflycore/build.gradle
View File

@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
apply plugin: 'java'
apply plugin: 'kotlin'
sourceCompatibility = 1.8
sourceCompatibility = 1.11
repositories {
mavenCentral()

2
butterflydao/build.gradle
View File

@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
apply plugin: 'java'
sourceCompatibility = 1.8
sourceCompatibility = 1.11
repositories {
mavenCentral()

2
butterflymodel/build.gradle
View File

@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
apply plugin: 'java'
sourceCompatibility = 1.8
sourceCompatibility = 1.11
repositories {
mavenCentral()

4
butterflyserver/build.gradle
View File

@ -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'
}
}

2
butterflyserver/src/main/resources/butterflyserver.properties
View File

@ -2,4 +2,4 @@
server.port = 80
server.maintenance = false
server.paselienable = true
server.forceextrastage = false
server.forceextrastage = true

4
butterflywebui/build.gradle
View File

@ -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'
}
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

2
gradlew vendored
View File

@ -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\""