Update to Kotlin 1.0 RC

OpenASR · Feb 6, 2016 · c7a9f3f · c7a9f3f
1 parent bbcd86c
commit c7a9f3f
Show file tree

Hide file tree

Showing 54 changed files with 330 additions and 556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@
  .idea/shelf
  .idea/tasks.xml
  .idea/dictionaries
- .idea/libraries/Gradle*.xml
+ .idea/libraries/
 
 # Sensitive or high-churn files:
 # .idea/dataSources.ids
@@ -36,7 +36,6 @@ idear.zip
 ### Gradle template
 .gradle
 build/
-gradle.properties
 
 # Ignore Gradle GUI config
 gradle-app.setting

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,23 @@
 buildscript {
+    ext.kotlin_version = '1.0.0-rc-1036'
+
     repositories {
         mavenCentral()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.0-beta-2423'
-        classpath 'gradle.plugin.org.jetbrains:gradle-intellij-plugin:0.0.28'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
+plugins {
+    id "org.jetbrains.intellij" version "0.0.39"
+}
+
 apply plugin: 'org.jetbrains.intellij'
+apply plugin: 'kotlin'
 apply plugin: 'java'
 
 compileJava {
@@ -22,7 +28,7 @@ compileJava {
 apply plugin: 'kotlin'
 
 intellij {
-    version '15.0.1'
+    version 'LATEST-EAP-SNAPSHOT'
     plugins 'coverage'
     pluginName 'idear'
 
@@ -46,7 +52,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
+//    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile 'edu.cmu.sphinx:sphinx4-core:5prealpha-SNAPSHOT'
     compile 'org.apache.opennlp:opennlp-tools:1.6.0'
     compile 'com.mashape.unirest:unirest-java:1.4.7'
@@ -56,4 +62,10 @@ dependencies {
     compile 'org.codehaus.jettison:jettison:1.3.7'
 
     testCompile 'junit:junit:4.12'
+    testCompile 'org.apache.opennlp:opennlp-tools:1.6.0'
+
+}
+
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
 }
diff --git a/gradlew b/gradlew
diff --git a/idear.iml b/idear.iml
diff --git a/src/main/java/com/jetbrains/idear/actions/recognition/ExtractActionRecognizer.kt b/src/main/java/com/jetbrains/idear/actions/recognition/ExtractActionRecognizer.kt
@@ -22,13 +22,13 @@ class ExtractActionRecognizer : ActionRecognizer {
         val index = data.second
 
         val newName = StringBuilder()
-        val newNameStartIndex = if (index + 1 < words.size() && words[index + 1] == "to")
+        val newNameStartIndex = if (index + 1 < words.size && words[index + 1] == "to")
             index + 2
         else
             index + 1
 
         var first = true
-        for (i in newNameStartIndex..words.size() - 1) {
+        for (i in newNameStartIndex..words.size - 1) {
             val word = if (first) words[i] else words[i].capitalize()
             newName.append(word)
             first = false

diff --git a/src/main/java/com/jetbrains/idear/jsgf/JSpeechIcons.java b/src/main/java/com/jetbrains/idear/jsgf/JSpeechIcons.java
@@ -5,6 +5,7 @@
  */
 
 import com.intellij.openapi.util.IconLoader;
+
 import javax.swing.*;
 
 public class JSpeechIcons {

diff --git a/src/main/java/com/jetbrains/idear/jsgf/JSpeechParser.java b/src/main/java/com/jetbrains/idear/jsgf/JSpeechParser.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/JSpeechUtil.java b/src/main/java/com/jetbrains/idear/jsgf/JSpeechUtil.java
@@ -7,8 +7,6 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.indexing.FileBasedIndex;
-import com.jetbrains.idear.jsgf.JSpeechFile;
-import com.jetbrains.idear.jsgf.JSpeechFileType;
 import com.jetbrains.idear.jsgf.psi.JSpeechRuleDefinition;
 
 import java.util.ArrayList;

diff --git a/src/main/java/com/jetbrains/idear/jsgf/_JSpeechLexer.java b/src/main/java/com/jetbrains/idear/jsgf/_JSpeechLexer.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechDeclaration.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechDeclaration.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechLiteral.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechLiteral.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRuleAlternative.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRuleAlternative.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRuleDefinition.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRuleDefinition.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRuleExpansion.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRuleExpansion.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRulename.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechRulename.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechScope.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechScope.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechSelfIdentHeader.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechSelfIdentHeader.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechSequenceElement.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechSequenceElement.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechSubexpansion.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechSubexpansion.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechTypes.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechTypes.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechVisitor.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechVisitor.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechWeight.java b/src/main/java/com/jetbrains/idear/jsgf/psi/JSpeechWeight.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/impl/JSpeechDeclarationImpl.java b/src/main/java/com/jetbrains/idear/jsgf/psi/impl/JSpeechDeclarationImpl.java
diff --git a/src/main/java/com/jetbrains/idear/jsgf/psi/impl/JSpeechLiteralImpl.java b/src/main/java/com/jetbrains/idear/jsgf/psi/impl/JSpeechLiteralImpl.java