Skip to content

Commit

Permalink
Fixed issue #850, upgraded gradle wrapper from 3.4.1 to 4.6 and conve…
Browse files Browse the repository at this point in the history
…rted some deprecated gradle codes to new gradle codes.
  • Loading branch information
duruer committed Jun 21, 2018
1 parent 59fcad6 commit 59ca8a7
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 21 deletions.
41 changes: 25 additions & 16 deletions build.gradle
Expand Up @@ -34,37 +34,37 @@ repositories {
maven {
url 'https://repo.destroystokyo.com/repository/maven-public/'
}

maven {
url 'http://ci.emc.gs/nexus/content/groups/aikar/'
}

maven {
url 'http://nexus.hc.to/content/repositories/pub_releases'
}

// maven {
// url 'http://maven.elmakers.com/repository/'
// }


maven {
url 'https://jitpack.io'
}
}

dependencies {
compile 'com.destroystokyo.paper:paper-api:1.12.1-R0.1-SNAPSHOT'
compile 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
compile 'com.google.code.findbugs:findbugs:2.0.3'
compile 'com.sk89q:worldguard:6.1.1-SNAPSHOT'
compile 'net.milkbowl.vault:Vault:1.6.6'
compile 'com.github.marcelo-mason:PreciousStones:24e3d4bf67b7240ae36b32be10e99d4091938c5c'
implementation 'com.destroystokyo.paper:paper-api:1.12.1-R0.1-SNAPSHOT'
implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
implementation 'com.google.code.findbugs:findbugs:2.0.3'
implementation 'com.sk89q:worldguard:6.1.1-SNAPSHOT'
implementation 'net.milkbowl.vault:Vault:1.6.6'
implementation 'com.github.marcelo-mason:PreciousStones:24e3d4bf67b7240ae36b32be10e99d4091938c5c'

testCompile 'junit:junit:4.12'
testCompile 'org.easymock:easymock:3.4'
testImplementation 'junit:junit:4.12'
testImplementation 'org.easymock:easymock:3.4'

compile fileTree(dir: 'lib', include: '*.jar')
implementation fileTree(dir: 'lib', include: '*.jar')
}

configurations.all {
Expand All @@ -81,7 +81,7 @@ processResources {

jar {
archiveName System.getenv('SKRIPT_JAR_NAME') == null ? 'Skript.jar' : System.getenv("SKRIPT_JAR_NAME")

manifest {
attributes("Name": "ch/njol/skript",
"Sealed": "true")
Expand Down Expand Up @@ -132,10 +132,19 @@ publishing {
}
}
}

repositories {
maven {
url "file:///itemapi_repo/"
}
}
}

/**
* Set compile encoding to UTF-8
* Fixes issue #850
*
*/
compileJava.options.encoding = 'UTF-8'

compileTestJava.options.encoding = 'UTF-8'
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Wed Sep 20 19:07:04 EEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down

0 comments on commit 59ca8a7

Please sign in to comment.