Merge pull request #64 from jeremymailen/kotlin-1.1.3-2

Upgrade to kotlin 1.1.3-2
pinterest · Jul 6, 2017 · 0b2f004 · 0b2f004
2 parents 4ec4d7d + 19ab11d
commit 0b2f004
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,2 +1,4 @@
 language: java
+jdk:
+  - oraclejdk8
 script: ./mvnw clean verify
diff --git a/ktlint-core/src/main/kotlin/com/github/shyiko/ktlint/core/KtLint.kt b/ktlint-core/src/main/kotlin/com/github/shyiko/ktlint/core/KtLint.kt
@@ -1,5 +1,6 @@
 package com.github.shyiko.ktlint.core
 
+import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.mock.MockProject
@@ -37,7 +38,7 @@ object KtLint {
 
     init {
         val project = KotlinCoreEnvironment.createForProduction(Disposable {},
-            CompilerConfiguration(), emptyList()).project
+            CompilerConfiguration(), EnvironmentConfigFiles.EMPTY).project
         // everything below (up to PsiFileFactory.getInstance(...)) is to get AST mutations (`ktlint -F ...`) working
         // otherwise it's not needed
         val pomModel: PomModel = object : UserDataHolderBase(), PomModel {

diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin.version>1.1.0</kotlin.version>
+        <kotlin.version>1.1.3-2</kotlin.version>
         <aether.version>1.1.0</aether.version>
         <aether.maven.provider.version>3.2.5</aether.maven.provider.version>
         <args4j.version>2.33</args4j.version>