Skip to content

Commit 41a4a44

Browse files
committed
Upgrade Kotlin version to 1.1.3-2, which is bundled with IntelliJ 2017.2
Upgrade Gradle wrapper version to 4.0.2 Upgrades Gradle IntelliJ Plugin to 0.2.15 Make necessary changes to build.gradle.kts for Gradle upgrade
1 parent 594668a commit 41a4a44

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ buildscript {
2929
}
3030

3131
plugins {
32-
id("org.jetbrains.kotlin.jvm") version "1.1.1" // kept in sync with IntelliJ's bundled dep
32+
id("org.jetbrains.kotlin.jvm") version "1.1.3-2" // kept in sync with IntelliJ's bundled dep
3333
groovy
3434
idea
35-
id("org.jetbrains.intellij") version "0.2.13"
35+
id("org.jetbrains.intellij") version "0.2.15"
3636
id("net.minecrell.licenser") version "0.3"
3737
}
3838

@@ -91,7 +91,7 @@ java {
9191
}
9292
}
9393

94-
val gradleToolingExtension = java().sourceSets["gradle-tooling-extension"]!!
94+
val gradleToolingExtension = java.sourceSets["gradle-tooling-extension"]!!
9595
val gradleToolingExtensionJar = task<Jar>(gradleToolingExtension.jarTaskName) {
9696
from(gradleToolingExtension.output)
9797
classifier = "gradle-tooling-extension"
@@ -174,7 +174,7 @@ test {
174174
idea {
175175
module {
176176
generatedSourceDirs.add(file("gen"))
177-
excludeDirs.add(file(intellij().sandboxDirectory))
177+
excludeDirs.add(file(intellij.sandboxDirectory))
178178
}
179179
}
180180

@@ -246,13 +246,13 @@ val generate = task("generate") {
246246
outputs.dir("gen")
247247
}
248248

249-
java().sourceSets[SourceSet.MAIN_SOURCE_SET_NAME].java.srcDir(generate)
249+
java.sourceSets[SourceSet.MAIN_SOURCE_SET_NAME].java.srcDir(generate)
250250

251251
// Workaround for KT-16764
252252
compileKotlin.inputs.dir(generate)
253253

254254
runIde {
255-
findProperty("intellijJre")?.let(this::setExecutable)
255+
(findProperty("intellijJre") as? String)?.let(this::setExecutable)
256256

257257
System.getProperty("debug")?.let {
258258
systemProperty("idea.ProcessCanceledException", "disabled")
@@ -261,7 +261,7 @@ runIde {
261261
}
262262

263263
inline operator fun <T : Task> T.invoke(a: T.() -> Unit): T = apply(a)
264-
fun KotlinDependencyHandler.kotlinModule(module: String) = kotlinModule(module, kotlinVersion) as String
264+
fun DependencyHandlerScope.kotlinModule(module: String) = kotlinModule(module, kotlinVersion) as String
265265
fun intellijPlugin(name: String) = mapOf(
266266
"group" to "org.jetbrains.plugins",
267267
"name" to name,

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# suppress inspection "UnusedProperty" for whole file
1111
ideaVersion = 2017.2
1212
javaVersion = 1.8
13-
kotlinVersion = 1.1.1
13+
kotlinVersion = 1.1.3-2
1414

1515
group = com.demonwav.minecraft-dev
1616
version = 2017.2-0.7.4

gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Apr 10 18:01:06 CEST 2017
1+
#Wed Jul 26 23:42:24 CDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-all.zip

0 commit comments

Comments
 (0)