Merge remote-tracking branch 'refs/remotes/origin/feature/testServerRunning'

Author: osipxd

.travis.yml

@@ -0,0 +1,26 @@
+language: groovy
+dist: trusty
+
+jdk:
+  - openjdk8
+
+before_install:
+  - chmod +x gradlew
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+  - $HOME/.m2/
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
+notifications:
+  email:
+    on_success: never
+    on_failure: always

build.gradle

@@ -2,17 +2,17 @@ plugins {
     id "groovy"
     id "idea"
 
-    id "de.undercouch.download" version "3.2.0"
-
     id "java-gradle-plugin"
     id "com.gradle.plugin-publish" version "0.9.7"
 }
 
-group "ru.endlesscode.gradle"
+apply from: 'jacoco.gradle'
+
+group "ru.endlesscode"
 description "Bukkit Gradle integration plugins"
-version "0.3.5"
+version "0.4.0"
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()
@@ -21,6 +21,7 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
+    compile group: "de.undercouch", name: "gradle-download-task", version: "3.2.+"
     testCompile group: "junit", name: "junit", version: "4.+"
 }
 
@@ -32,7 +33,7 @@ pluginBundle {
 
     plugins {
         bukkitPlugin {
-            id = "ru.endlesscode.gradle.bukkit"
+            id = "ru.endlesscode.bukkitgradle"
             displayName = "Bukkit Plugin Gradle integration"
             description = "Gradle plugin providing integration for plugins made for the Bukkit platform"
         }

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

@@ -0,0 +1,11 @@
+apply plugin: 'jacoco'
+
+jacocoTestReport {
+    reports {
+        xml.enabled = true
+        csv.enabled = false
+        html.enabled = true
+    }
+}
+
+check.dependsOn jacocoTestReport

jacoco.gradle

@@ -1,4 +1,4 @@
-package ru.endlesscode.gradle.bukkit
+package ru.endlesscode.bukkitgradle
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
@@ -7,10 +7,10 @@ import org.gradle.api.artifacts.DependencyResolutionListener
 import org.gradle.api.artifacts.ResolvableDependencies
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.compile.JavaCompile
-import ru.endlesscode.gradle.bukkit.meta.PluginMetaPlugin
-import ru.endlesscode.gradle.bukkit.server.TestServerPlugin
+import ru.endlesscode.bukkitgradle.meta.PluginMetaPlugin
+import ru.endlesscode.bukkitgradle.server.TestServerPlugin
 
-class BukkitPlugin implements Plugin<Project> {
+class BukkitGradlePlugin implements Plugin<Project> {
     Project project
 
     @Override
@@ -22,7 +22,7 @@ class BukkitPlugin implements Plugin<Project> {
     /**
      * Configures project
      */
-    def configureProject() {
+    void configureProject() {
         addPlugins()
         configureEncoding()
         addRepositories()
@@ -32,7 +32,7 @@ class BukkitPlugin implements Plugin<Project> {
     /**
      * Adds all needed plugins
      */
-    def addPlugins() {
+    void addPlugins() {
         project.with {
             plugins.with {
                 apply("java")
@@ -51,7 +51,7 @@ class BukkitPlugin 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 BukkitPlugin implements Plugin<Project> {
     /**
      * Adds needed repositories
      */
-    def addRepositories() {
+    void addRepositories() {
         project.with {
             repositories {
                 mavenLocal()
@@ -82,7 +82,7 @@ class BukkitPlugin 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 BukkitPlugin 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"))

…sscode/gradle/bukkit/BukkitPlugin.groovy …e/bukkitgradle/BukkitGradlePlugin.groovysrc/main/groovy/ru/endlesscode/gradle/bukkit/BukkitPlugin.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePlugin.groovy src/main/groovy/ru/endlesscode/gradle/bukkit/BukkitPlugin.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePlugin.groovy

@@ -0,0 +1,41 @@
+package ru.endlesscode.bukkitgradle.extension
+
+import org.gradle.api.Project
+import ru.endlesscode.bukkitgradle.meta.PluginMeta
+
+class Bukkit {
+    public static final String NAME = "bukkit"
+    public static final String DYNAMIC_LATEST = "+"
+    public static final String REVISION_SUFFIX = "-R0.1-SNAPSHOT"
+
+    private final Project project
+
+    String version
+    final PluginMeta meta
+    final RunConfiguration run
+
+    Bukkit(Project project) {
+        this.project = project
+        this.meta = new PluginMeta(project)
+        this.run = new RunConfiguration(project)
+    }
+
+    /**
+     * Returns chosen Bukkit version in format:
+     * "<version>-R0.1-SNAPSHOT"
+     * If version not assigned returns dynamic latest version
+     *
+     * @return Chosen Bukkit version
+     */
+    String getVersion() {
+        return version ? "$version$REVISION_SUFFIX" : DYNAMIC_LATEST
+    }
+
+    void meta(@DelegatesTo(PluginMeta) Closure<?> closure) {
+        project.configure(meta, closure)
+    }
+
+    void run(@DelegatesTo(RunConfiguration) Closure<?> closure) {
+        project.configure(run, closure)
+    }
+}

src/main/groovy/ru/endlesscode/bukkitgradle/extension/Bukkit.groovy

@@ -0,0 +1,11 @@
+package ru.endlesscode.bukkitgradle.extension
+
+import org.gradle.api.Project
+
+class RunConfiguration {
+    private Project project
+
+    RunConfiguration(Project project) {
+        this.project = project
+    }
+}

src/main/groovy/ru/endlesscode/bukkitgradle/extension/RunConfiguration.groovy

@@ -1,4 +1,4 @@
-package ru.endlesscode.gradle.bukkit.meta
+package ru.endlesscode.bukkitgradle.meta
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input

…e/gradle/bukkit/meta/GenerateMeta.groovy …de/bukkitgradle/meta/GenerateMeta.groovysrc/main/groovy/ru/endlesscode/gradle/bukkit/meta/GenerateMeta.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/meta/GenerateMeta.groovy src/main/groovy/ru/endlesscode/gradle/bukkit/meta/GenerateMeta.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/meta/GenerateMeta.groovy

@@ -1,4 +1,4 @@
-package ru.endlesscode.gradle.bukkit.meta
+package ru.endlesscode.bukkitgradle.meta
 
 import org.gradle.api.GradleException
 import org.gradle.api.Project