Skip to content

Commit c3f3915

Browse files
committed
Bump Kotlin verion to 1.3.11
1 parent 3cae16d commit c3f3915

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
3434
}
3535
}
3636

37-
kotlin {
38-
experimental {
39-
coroutines 'enable'
40-
}
41-
}
42-
4337
repositories {
4438
mavenCentral()
4539
maven { url 'https://repo.gradle.org/gradle/libs-releases' }

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
teamCityUrl=https://teamcity.jetbrains.com
22
teamCityUsername=guest
33
teamCityPassword=guest
4-
kotlinVersion=1.2.70
5-
kotlinBuildType=Kotlin_1270_CompilerAllPlugins
6-
kotlinBuild=1.2.72-release-68
7-
kotlinPluginBuild=1.2.72-release-IJ2018.3-1
4+
kotlinVersion=1.3.11
5+
kotlinBuildType=Kotlin_130_CompilerAllPlugins
6+
kotlinBuild=1.3.11-release-272
7+
kotlinPluginBuild=1.3.11-release-IJ2018.3-1

src/main/kotlin/org/javacs/kt/classpath/FindClassPath.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private fun findLocalArtifact(group: String, artifact: String) = firstNonNull<Pa
183183
{ tryResolving("$artifact using Gradle") { tryFindingLocalArtifactUsing(group, artifact, findLocalArtifactDirUsingGradle(group, artifact)) } }
184184
)
185185

186-
private fun tryFindingLocalArtifactUsing(group: String, artifact: String, artifactDirResolution: LocalArtifactDirectoryResolution): Path? {
186+
private fun tryFindingLocalArtifactUsing(@Suppress("UNUSED_PARAMETER") group: String, artifact: String, artifactDirResolution: LocalArtifactDirectoryResolution): Path? {
187187
val isCorrectArtifact = BiPredicate<Path, BasicFileAttributes> { file, _ ->
188188
val name = file.fileName.toString()
189189
when (artifactDirResolution.buildTool) {

src/main/kotlin/org/javacs/kt/references/FindReferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private fun possibleInvokeReferences(declaration: FunctionDescriptor, sp: Source
141141
sp.all().filter { possibleInvokeReference(declaration, it) }.toSet()
142142

143143
// TODO this is not very selective
144-
private fun possibleInvokeReference(declaration: FunctionDescriptor, source: KtFile): Boolean =
144+
private fun possibleInvokeReference(@Suppress("UNUSED_PARAMETER") declaration: FunctionDescriptor, source: KtFile): Boolean =
145145
source.preOrderTraversal().filterIsInstance<KtCallExpression>().any()
146146

147147
private fun isComponent(declaration: DeclarationDescriptor): Boolean =

src/main/kotlin/org/javacs/kt/util/Utils.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import java.io.PrintStream
88
import java.nio.file.Path
99
import java.nio.file.Paths
1010
import java.util.concurrent.CompletableFuture
11-
import kotlin.coroutines.experimental.buildSequence
1211

1312
inline fun<reified Find> PsiElement.findParent() =
1413
this.parentsWithSelf.filterIsInstance<Find>().firstOrNull()
@@ -33,7 +32,7 @@ inline fun withCustomStdout(delegateOut: PrintStream, task: () -> Unit) {
3332
fun PsiElement.preOrderTraversal(): Sequence<PsiElement> {
3433
val root = this
3534

36-
return buildSequence {
35+
return sequence {
3736
yield(root)
3837

3938
for (child in root.children) {

0 commit comments

Comments
 (0)