Merge branch '2017.1' into 2017.2

# Conflicts:
#	gradle.properties
#	readme.md
#	src/main/java/com/demonwav/mcdev/platform/MinecraftModuleType.java
#	src/main/resources/META-INF/plugin.xml

Author: DenWav

.travis.yml

@@ -8,7 +8,7 @@ install: true
 script: ./gradlew build
 
 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -f $HOME/.gradle/caches/{modules-2,transforms-1}/*.lock
   - rm -rf $HOME/.gradle/caches/*/{file-changes,fileHashes,plugin-resolution,scripts,scripts-remapped,gradle-script-kotlin}/
 cache:
   directories:

build.gradle.kts

@@ -9,12 +9,13 @@
  */
 
 import org.gradle.api.tasks.AbstractCopyTask
-import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.internal.jvm.Jvm
+import org.jetbrains.intellij.tasks.PublishTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 
@@ -31,7 +32,7 @@ plugins {
     id("org.jetbrains.kotlin.jvm") version "1.1.1"
     groovy
     idea
-    id("org.jetbrains.intellij") version "0.2.5"
+    id("org.jetbrains.intellij") version "0.2.7"
     id("net.minecrell.licenser") version "0.3"
 }
 
@@ -44,18 +45,27 @@ val javaVersion: String by extra
 val kotlinVersion: String by extra
 val downloadIdeaSources: String by extra
 
-val clean: Delete by tasks
+// for publishing nightlies
+val repoUsername: String by extra
+val repoPassword: String by extra
+val repoChannel: String by extra
+
+val compileKotlin by tasks
 val processResources: AbstractCopyTask by tasks
+val test: Test by tasks
 val runIde: JavaExec by tasks
-val compileKotlin by tasks
+val publishPlugin: PublishTask by tasks
 
 configurations {
+    "kotlin"()
+    "compileOnly" { extendsFrom("kotlin"()) }
+    "testCompile" { extendsFrom("kotlin"()) }
+
+    "gradle-tooling-extension" { extendsFrom("idea"()) }
     "jflex"()
     "jflex-skeleton"()
     "grammar-kit"()
-    "testLibs" {
-        isTransitive = false
-    }
+    "testLibs" { isTransitive = false }
 }
 
 repositories {
@@ -70,23 +80,34 @@ repositories {
     }
 }
 
-dependencies {
-    compile(kotlinModule("stdlib-jre8")) {
-        // JetBrains annotations are already bundled with IntelliJ IDEA
-        exclude(group = "org.jetbrains", module = "annotations")
+java {
+    setSourceCompatibility(javaVersion)
+    setTargetCompatibility(javaVersion)
+
+    sourceSets {
+        "gradle-tooling-extension" {
+            configurations[compileOnlyConfigurationName].extendsFrom(configurations["gradle-tooling-extension"])
+        }
     }
+}
+
+val gradleToolingExtension = java().sourceSets["gradle-tooling-extension"]
+val gradleToolingExtensionJar = task<Jar>(gradleToolingExtension.jarTaskName) {
+    from(gradleToolingExtension.output)
+    classifier = "gradle-tooling-extension"
+}
+
+dependencies {
+    "kotlin"(kotlinModule("runtime")) { isTransitive = false }
+    "kotlin"(kotlinModule("stdlib")) { isTransitive = false }
+    compile(kotlinModule("stdlib-jre7")) { isTransitive = false }
+    compile(kotlinModule("stdlib-jre8")) { isTransitive = false }
 
     // Add tools.jar for the JDI API
     compile(files(Jvm.current().toolsJar))
 
-    // Add an additional dependency on kotlin-runtime. It is essentially useless
-    // (since kotlin-runtime is a transitive dependency of kotlin-stdlib-jre8)
-    // but without kotlin-stdlib or kotlin-runtime on the classpath,
-    // gradle-intellij-plugin will add IntelliJ IDEA's Kotlin version to the
-    // dependencies which conflicts with our newer version.
-    compile(kotlinModule("runtime")) {
-        isTransitive = false
-    }
+    compile(files(gradleToolingExtensionJar))
+    "gradle-tooling-extension"(intellijPlugin("gradle"))
 
     "jflex"("org.jetbrains.idea:jflex:1.7.0-b7f882a")
     "jflex-skeleton"("org.jetbrains.idea:jflex:1.7.0-c1fdf11:idea@skeleton")
@@ -98,7 +119,7 @@ dependencies {
 
 intellij {
     // IntelliJ IDEA dependency
-    version = ideaVersion
+    version = "IC-$ideaVersion"
     // Bundled plugin dependencies
     setPlugins("maven", "gradle", "Groovy",
         // needed dependencies for unit tests
@@ -112,9 +133,14 @@ intellij {
     sandboxDirectory = project.rootDir.canonicalPath + "/.sandbox"
 }
 
-java {
-    setSourceCompatibility(javaVersion)
-    setTargetCompatibility(javaVersion)
+publishPlugin {
+    if (properties["publish"] != null) {
+        project.version = "${project.version}-${properties["buildNumber"]}"
+
+        username(repoUsername)
+        password(repoPassword)
+        channels(repoChannel)
+    }
 }
 
 tasks.withType<JavaCompile> {
@@ -133,7 +159,7 @@ processResources {
     }
 }
 
-tasks.withType<Test> {
+test {
     if (CI) {
         systemProperty("slowCI", "true")
     }
@@ -231,3 +257,9 @@ runIde {
 
 inline operator fun <T : Task> T.invoke(a: T.() -> Unit): T = apply(a)
 fun KotlinDependencyHandler.kotlinModule(module: String) = kotlinModule(module, kotlinVersion) as String
+fun intellijPlugin(name: String) = mapOf(
+    "group" to "org.jetbrains.plugins",
+    "name" to name,
+    "version" to ideaVersion,
+    "configuration" to "compile"
+)

gradle.properties

@@ -13,7 +13,7 @@ javaVersion = 1.8
 kotlinVersion = 1.1.1
 
 group = com.demonwav.minecraft-dev
-version = 2017.2-0.6.2
+version = 2017.2-0.6.3
 downloadIdeaSources = true
 
 org.gradle.script.lang.kotlin.accessors.auto=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu Mar 09 16:36:31 CET 2017
+#Thu Mar 23 16:41:24 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://repo.gradle.org/gradle/dist-snapshots/gradle-script-kotlin-3.5-20170305000422+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,15 +1,16 @@
 <p align="center"><a href="https://minecraftdev.org/"><img src="https://minecraftdev.org/assets/icon.svg" height="120"></img></a></p>
 
-Minecraft Development for IntelliJ [![forthebadge](http://forthebadge.com/images/badges/made-with-crayons.svg)](http://forthebadge.com)
+Minecraft Development for IntelliJ
 ==================================
 
 |  Service   |Status|
 |------------|------|
 |**TeamCity**|[![TeamCity Build Status](https://img.shields.io/teamcity/http/ci.demonwav.com/s/MinecraftDev_Build.svg?style=flat-square)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Build)|
+|**Nightly**|[![TeamCity Build Status](https://img.shields.io/teamcity/http/ci.demonwav.com/s/MinecraftDev_Nightly.svg?style=flat-square)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly)|
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/2017.1.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 |**Travis**  |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/2017.1.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.6.2-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.6.3-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for information about the project, change logs, features, FAQs, and chat.

readme.md

@@ -8,7 +8,7 @@
  * MIT License
  */
 
-package com.demonwav.mcdev.platform.mcp.gradle
+package com.demonwav.mcdev.platform.mcp.gradle.tooling
 
 import org.gradle.api.Project
 import org.jetbrains.annotations.NotNull

src/main/groovy/com/demonwav/mcdev/platform/mcp/gradle/McpModelBuilderImpl.groovy renamed to src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelBuilderImpl.groovy

@@ -8,7 +8,7 @@
  * MIT License
  */
 
-package com.demonwav.mcdev.platform.mcp.gradle
+package com.demonwav.mcdev.platform.mcp.gradle.tooling
 
 import groovy.transform.CompileStatic
 

src/main/groovy/com/demonwav/mcdev/platform/mcp/gradle/McpModelImpl.groovy renamed to src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelImpl.groovy

@@ -8,15 +8,12 @@
  * MIT License
  */
 
-package com.demonwav.mcdev.platform.mcp.gradle;
+package com.demonwav.mcdev.platform.mcp.gradle.tooling;
 
 import java.util.Set;
 
 public interface McpModel {
-
     String getMinecraftVersion();
-
     String getMcpVersion();
-
     Set<String> getMappingFiles();
 }

src/main/java/com/demonwav/mcdev/platform/mcp/gradle/McpModel.java renamed to src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModel.java

@@ -0,0 +1 @@
+com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelBuilderImpl