Merge pull request #27 from EndlessCodeGroup/develop

v0.8.2

Author: osipxd

.gitignore

@@ -5,6 +5,7 @@
 
 ## File-based project format:
 *.iws
+*.iml
 
 ## Gradle
 .gradle/

README.md

@@ -29,10 +29,12 @@ Gradle utilities for easier writing Bukkit plugins.
 
 ## Apply plugin
 [BukkitGradle on plugins.gradle.org](https://plugins.gradle.org/plugin/ru.endlesscode.bukkitgradle)
+> **NOTE:** Gradle 5.0+ required
+
 #### With new plugins mechanism
 ```groovy
 plugins {
-  id "ru.endlesscode.bukkitgradle" version "0.8.1"
+  id "ru.endlesscode.bukkitgradle" version "0.8.2"
 }
 ```
 
@@ -43,7 +45,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath "gradle.plugin.ru.endlesscode:bukkit-gradle:0.8.1"
+    classpath "gradle.plugin.ru.endlesscode:bukkit-gradle:0.8.2"
   }
 }
 
@@ -57,7 +59,7 @@ You can clone [this example project](https://github.com/EndlessCodeGroup/BukkitG
 Simple `build.gradle` file that use BukkitGradle:
 ```groovy
 plugins {
-    id "ru.endlesscode.bukkitgradle" version "0.8.1"
+    id "ru.endlesscode.bukkitgradle" version "0.8.2"
 }
  
 // Project information

build.gradle

@@ -1,9 +1,8 @@
 plugins {
     id "groovy"
-    id "idea"
-
     id "java-gradle-plugin"
     id "com.gradle.plugin-publish" version "0.9.10"
+    id "com.github.ben-manes.versions" version "0.21.0"
 }
 
 apply from: "jacoco.gradle"
@@ -14,8 +13,6 @@ repositories {
     mavenCentral()
 }
 
-jar.archivePath
-
 dependencies {
     implementation gradleApi()
     implementation localGroovy()

gradle.properties

@@ -1,6 +1,6 @@
 group=ru.endlesscode
 description=Bukkit Gradle integration plugins
-version=0.8.1
+version=0.8.2
 org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 org.gradle.daemon=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
+#Fri Apr 12 00:37:38 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,21 @@
 #!/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
+#
+#      http://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
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 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.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -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      http://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
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 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.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -2,6 +2,7 @@ package ru.endlesscode.bukkitgradle.task
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import ru.endlesscode.bukkitgradle.meta.MetaFile
 
@@ -10,6 +11,8 @@ import java.nio.file.Path
 class GenerateMeta extends DefaultTask {
     @Input
     MetaFile metaFile
+
+    @OutputFile
     Path target
 
     Path getTarget() {

src/main/groovy/ru/endlesscode/bukkitgradle/task/GenerateMeta.groovy

@@ -2,6 +2,7 @@ package ru.endlesscode.bukkitgradle.task
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.gradle.jvm.tasks.Jar
 import ru.endlesscode.bukkitgradle.extension.RunConfiguration
@@ -15,13 +16,16 @@ class PrepareServer extends DefaultTask {
     @Input
     ServerCore core
 
-    Closure<Path> serverDir
+    @Input
     RunConfiguration run
 
+    @OutputDirectory
+    Closure<Path> serverDir
+
     void setCore(ServerCore core) {
         this.core = core
-        this.serverDir = { core.serverDir }
         this.run = project.bukkit.run
+        this.serverDir = { Files.createDirectories(core.serverDir) }
     }
 
     @TaskAction
@@ -58,8 +62,8 @@ class PrepareServer extends DefaultTask {
     void copyPluginsToServerDir() {
         String pluginName = "${project.bukkit.meta.name}.jar"
         List<Path> paths = project.tasks.withType(Jar).collect { jar ->
-            if (jar.classifier in ["src", "source", "sources", "javadoc"]) return
-            jar.archivePath.toPath()
+            if (jar.archiveClassifier.get() in ["src", "source", "sources", "javadoc"]) return
+            jar.archiveFile.get().asFile.toPath()
         }
 
         Path pluginsDir = getServerDir().resolve("plugins")