Skip to content

Commit c7a9f3f

Browse files
committed
Update to Kotlin 1.0 RC
1 parent bbcd86c commit c7a9f3f

54 files changed

Lines changed: 330 additions & 556 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.idea/shelf
1313
.idea/tasks.xml
1414
.idea/dictionaries
15-
.idea/libraries/Gradle*.xml
15+
.idea/libraries/
1616

1717
# Sensitive or high-churn files:
1818
# .idea/dataSources.ids
@@ -36,7 +36,6 @@ idear.zip
3636
### Gradle template
3737
.gradle
3838
build/
39-
gradle.properties
4039

4140
# Ignore Gradle GUI config
4241
gradle-app.setting

.idea/compiler.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
buildscript {
2+
ext.kotlin_version = '1.0.0-rc-1036'
3+
24
repositories {
35
mavenCentral()
46
maven {
57
url "https://plugins.gradle.org/m2/"
68
}
79
}
810
dependencies {
9-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.0-beta-2423'
10-
classpath 'gradle.plugin.org.jetbrains:gradle-intellij-plugin:0.0.28'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1112
}
1213
}
1314

15+
plugins {
16+
id "org.jetbrains.intellij" version "0.0.39"
17+
}
18+
1419
apply plugin: 'org.jetbrains.intellij'
20+
apply plugin: 'kotlin'
1521
apply plugin: 'java'
1622

1723
compileJava {
@@ -22,7 +28,7 @@ compileJava {
2228
apply plugin: 'kotlin'
2329

2430
intellij {
25-
version '15.0.1'
31+
version 'LATEST-EAP-SNAPSHOT'
2632
plugins 'coverage'
2733
pluginName 'idear'
2834

@@ -46,7 +52,7 @@ repositories {
4652
}
4753

4854
dependencies {
49-
compile 'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
55+
// compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5056
compile 'edu.cmu.sphinx:sphinx4-core:5prealpha-SNAPSHOT'
5157
compile 'org.apache.opennlp:opennlp-tools:1.6.0'
5258
compile 'com.mashape.unirest:unirest-java:1.4.7'
@@ -56,4 +62,10 @@ dependencies {
5662
compile 'org.codehaus.jettison:jettison:1.3.7'
5763

5864
testCompile 'junit:junit:4.12'
65+
testCompile 'org.apache.opennlp:opennlp-tools:1.6.0'
66+
67+
}
68+
69+
sourceSets {
70+
main.java.srcDirs += 'src/main/kotlin'
5971
}

gradlew

100644100755
File mode changed.

idear.iml

Lines changed: 0 additions & 168 deletions
This file was deleted.

src/main/java/com/jetbrains/idear/actions/recognition/ExtractActionRecognizer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class ExtractActionRecognizer : ActionRecognizer {
2222
val index = data.second
2323

2424
val newName = StringBuilder()
25-
val newNameStartIndex = if (index + 1 < words.size() && words[index + 1] == "to")
25+
val newNameStartIndex = if (index + 1 < words.size && words[index + 1] == "to")
2626
index + 2
2727
else
2828
index + 1
2929

3030
var first = true
31-
for (i in newNameStartIndex..words.size() - 1) {
31+
for (i in newNameStartIndex..words.size - 1) {
3232
val word = if (first) words[i] else words[i].capitalize()
3333
newName.append(word)
3434
first = false

0 commit comments

Comments
 (0)