Fixed imports and server core downloading

Author: osipxd

build.gradle

@@ -10,7 +10,7 @@ group "ru.endlesscode"
 description "Bukkit Gradle integration plugins"
 version "0.3.5"
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()

gradle/wrapper/gradle-wrapper.jar

@@ -1,4 +1,4 @@
-#Fri Apr 14 21:55:45 MSK 2017
+#Mon Apr 17 14:37:01 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -22,7 +22,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Configures project
      */
-    def configureProject() {
+    void configureProject() {
         addPlugins()
         configureEncoding()
         addRepositories()
@@ -32,7 +32,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Adds all needed plugins
      */
-    def addPlugins() {
+    void addPlugins() {
         project.with {
             plugins.with {
                 apply("java")
@@ -51,7 +51,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Sets force encoding on compile to UTF-8
      */
-    def configureEncoding() {
+    void configureEncoding() {
         project.tasks.withType(JavaCompile) {
             options.encoding = "UTF-8"
         }
@@ -60,7 +60,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Adds needed repositories
      */
-    def addRepositories() {
+    void addRepositories() {
         project.with {
             repositories {
                 mavenLocal()
@@ -82,7 +82,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Adds needed dependencies
      */
-    def addDependencies() {
+    void addDependencies() {
         project.gradle.addListener(new DependencyResolutionListener() {
             @Override
             void beforeResolve(ResolvableDependencies resolvableDependencies) {
@@ -99,7 +99,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
      * Adds Bukkit API to project dependencies
      * @param project The project
      */
-    static def addBukkitApi(Project project) {
+    static void addBukkitApi(Project project) {
         project.with {
             def compileDeps = configurations.compile.dependencies
             compileDeps.add(dependencies.create("org.bukkit:bukkit:$bukkit.version"))

src/main/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePlugin.groovy

@@ -1,7 +1,8 @@
 package ru.endlesscode.bukkitgradle.server
 
-import de.undercouch.gradle.tasks.download.Download
+import de.undercouch.gradle.tasks.download.DownloadExtension
 import org.gradle.api.Project
+import org.gradle.api.Task
 import ru.endlesscode.bukkitgradle.extension.Bukkit
 
 import java.nio.file.Files
@@ -27,24 +28,35 @@ class ServerCore {
     }
 
     void registerTasks() {
-        registerAndExecuteUpdateMetaTask()
+        registerUpdateMetaTask()
         registerDownloadingTask()
     }
 
-    void registerAndExecuteUpdateMetaTask() {
-        project.task("updateServerCoreMetadata", type: Download) {
-            src "https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/bukkit/bukkit/$MAVEN_METADATA"
-            dest downloadDir.toFile()
-            quiet true
-            onlyIfNewer true
-        }.execute()
+    Task registerUpdateMetaTask() {
+        def task = project.task("updateServerCoreMetadata")
+        task.extensions.create("download", DownloadExtension, project)
+
+        task.doLast {
+            println "Meta"
+            download {
+                src "https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/bukkit/bukkit/$MAVEN_METADATA"
+                dest downloadDir.toFile()
+                quiet true
+            }
+        }
     }
 
-    void registerDownloadingTask() {
-        project.task("downloadServerCore", type: Download) {
-            src "https://yivesmirror.com/files/spigot/${getCoreName()}"
-            dest downloadDir.toFile()
-            onlyIfNewer true
+    Task registerDownloadingTask() {
+        def task = project.task("downloadServerCore", dependsOn: "updateServerCoreMetadata")
+        task.extensions.create("download", DownloadExtension, project)
+
+        task.doLast {
+            download {
+                println "Download"
+                src { "https://yivesmirror.com/files/spigot/${getCoreName()}" }
+                dest downloadDir.toFile()
+                onlyIfNewer true
+            }
         }
     }
 

src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerCore.groovy

@@ -2,6 +2,7 @@ package ru.endlesscode.bukkitgradle.bukkit
 
 import org.gradle.api.artifacts.Dependency
 import org.junit.Test
+import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
 
 import static org.junit.Assert.assertTrue
 

src/test/groovy/ru/endlesscode/bukkitgradle/bukkit/BukkitGradlePluginTest.groovy

@@ -1,7 +1,7 @@
 package ru.endlesscode.bukkitgradle.bukkit
 
 import org.junit.Test
-import ru.endlesscode.bukkitgradle.bukkit.meta.PluginMeta
+import ru.endlesscode.bukkitgradle.meta.PluginMeta
 
 import static org.junit.Assert.*
 

src/test/groovy/ru/endlesscode/bukkitgradle/bukkit/BukkitTest.groovy

@@ -1,9 +1,11 @@
 package ru.endlesscode.bukkitgradle.bukkit
 
 import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.Before
-import ru.endlesscode.bukkitgradle.bukkit.meta.MetaFile
+import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
+import ru.endlesscode.bukkitgradle.meta.MetaFile
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -76,4 +78,12 @@ website: www.example_s.com
 
 depend: [Vault, ProtocolLib]'''
     }
+
+    protected void executeTask(Task task) {
+        task.taskDependencies.getDependencies(task).each {
+            subTask -> executeTask(subTask)
+        }
+
+        task.execute()
+    }
 }

src/test/groovy/ru/endlesscode/bukkitgradle/bukkit/TestBase.groovy

@@ -2,6 +2,7 @@ package ru.endlesscode.bukkitgradle.bukkit.meta
 
 import org.junit.Test
 import ru.endlesscode.bukkitgradle.bukkit.TestBase
+import ru.endlesscode.bukkitgradle.meta.GenerateMeta
 
 import static org.junit.Assert.assertTrue
 

src/test/groovy/ru/endlesscode/bukkitgradle/bukkit/meta/GenerateMetaTest.groovy

@@ -4,6 +4,7 @@ import org.gradle.api.GradleException
 import org.junit.Before
 import org.junit.Test
 import ru.endlesscode.bukkitgradle.bukkit.TestBase
+import ru.endlesscode.bukkitgradle.meta.MetaFile
 
 import java.nio.file.Path