Merge pull request #501 from EngineHub/feature/gradle-5

Update to Gradle 5
Dieser Commit ist enthalten in:
Kenzie Togami 2019-07-11 22:01:09 -07:00 committet von GitHub
Commit 4874c314d0
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
7 geänderte Dateien mit 48 neuen und 13 gelöschten Zeilen

Datei anzeigen

@ -1,4 +1 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties. org.gradle.jvmargs=-Xmx1G
# This is required to provide enough memory for the Minecraft decompilation process.
#org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

Binäre Datei nicht angezeigt.

Datei anzeigen

@ -1,6 +1,5 @@
#Thu Mar 14 00:19:48 PDT 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

18
gradlew vendored
Datei anzeigen

@ -1,5 +1,21 @@
#!/usr/bin/env sh #!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
############################################################################## ##############################################################################
## ##
## Gradle start up script for UN*X ## Gradle start up script for UN*X
@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="" DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"

18
gradlew.bat vendored
Datei anzeigen

@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS= set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome

Datei anzeigen

@ -1,5 +1,5 @@
plugins { plugins {
id("net.ltgt.apt") version "0.21" id("net.ltgt.apt") version "0.21" apply false
} }
apply plugin: 'java-library' apply plugin: 'java-library'
@ -36,6 +36,7 @@ dependencies {
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
dependsOn(":worldedit-libs:build")
it.options.compilerArgs.add("-Aarg.name.key.prefix=") it.options.compilerArgs.add("-Aarg.name.key.prefix=")
} }

Datei anzeigen

@ -13,6 +13,7 @@ dependents of `-core` to compile and work with WorldEdit's API.
*/ */
configure(subprojects + project("core:ap")) { configure(subprojects + project("core:ap")) {
apply plugin: 'java'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.jfrog.artifactory' apply plugin: 'com.jfrog.artifactory'
@ -23,7 +24,8 @@ configure(subprojects + project("core:ap")) {
group = rootProject.group + ".worldedit-libs" group = rootProject.group + ".worldedit-libs"
tasks.register("jar", ShadowJar) { tasks.replace("jar", ShadowJar)
tasks.withType(ShadowJar).named("jar").configure {
configurations = [project.configurations.shade] configurations = [project.configurations.shade]
classifier = "" classifier = ""
@ -69,11 +71,15 @@ configure(subprojects + project("core:ap")) {
} }
artifacts { artifacts {
add("default", jar) add("default", jar) {
add("archives", sourcesJar) builtBy(jar)
}
add("archives", sourcesJar) {
builtBy(sourcesJar)
}
} }
tasks.register("install", Upload) { tasks.withType(Upload).named("install").configure {
configuration = configurations.archives configuration = configurations.archives
repositories.mavenInstaller { repositories.mavenInstaller {
pom.version = project.version pom.version = project.version