Skip to content

Commit 0a03d7e

Browse files
committed
Fix disabled test of completion after numbers
1 parent c29a889 commit 0a03d7e

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ dependencies {
9393
fun implKotlin(module: String, version: String? = kotlinVersion) = implementation(kotlin(module, version))
9494

9595
// Standard dependencies
96-
implKotlin("stdlib", null)
97-
implKotlin("reflect", null)
98-
implKotlin("stdlib-jdk8", null)
96+
implKotlin("reflect")
97+
implKotlin("stdlib-jdk8")
9998
implementation("org.jetbrains:annotations:20.1.0")
10099
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
101100

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# Kotlin kernel for IPython/Jupyter
1010

11-
[Kotlin](https://kotlinlang.org/) (1.5.30-dev-2630) kernel for [Jupyter](https://jupyter.org).
11+
[Kotlin](https://kotlinlang.org/) (1.6.0-dev-903) kernel for [Jupyter](https://jupyter.org).
1212

1313
Beta version. Tested with Jupyter Notebook 6.0.3, Jupyter Lab 1.2.6 and Jupyter Console 6.1.0
1414
on Windows, Ubuntu Linux and macOS.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# kotlinVersion=1.5.255-SNAPSHOT
2-
kotlinVersion=1.5.30-dev-2630
2+
kotlinVersion=1.6.0-dev-903
33
stableKotlinVersion=1.5.20
44
gradleKotlinVersion=1.4.31
55
kotlinLanguageLevel=1.5

kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/readmeGenerator.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jetbrains.kotlinx.jupyter.build
22

33
import groovy.json.JsonSlurper
4+
import org.gradle.api.Task
45
import org.gradle.kotlin.dsl.getValue
56
import org.gradle.kotlin.dsl.provideDelegate
67
import org.gradle.kotlin.dsl.registering
@@ -81,13 +82,19 @@ fun ProjectWithOptions.prepareReadmeTasks() {
8182
val librariesDir = File(rootProject.projectDir, librariesPath)
8283
val readmeGenerator = ReadmeGenerator(librariesDir, kotlinVersion, projectRepoUrl)
8384

85+
fun Task.defineInputs() {
86+
inputs.file(readmeStubFile)
87+
inputs.dir(librariesDir)
88+
inputs.property("kotlinVersion", kotlinVersion)
89+
inputs.property("projectRepoUrl", projectRepoUrl)
90+
}
91+
8492
val generateReadme by tasks.registering {
8593
group = buildGroup
8694

8795
readmeFile.parentFile.mkdirs()
8896

89-
inputs.file(readmeStubFile)
90-
inputs.dir(librariesDir)
97+
defineInputs()
9198
outputs.file(readmeFile)
9299

93100
doLast {
@@ -98,8 +105,7 @@ fun ProjectWithOptions.prepareReadmeTasks() {
98105
tasks.register("checkReadme") {
99106
group = "verification"
100107

101-
inputs.file(readmeStubFile)
102-
inputs.dir(librariesDir)
108+
defineInputs()
103109
inputs.file(readmeFile)
104110

105111
doLast {

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/ReplTests.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import org.jetbrains.kotlinx.jupyter.repl.ListErrorsResult
1313
import org.jetbrains.kotlinx.jupyter.test.getOrFail
1414
import org.jetbrains.kotlinx.jupyter.withPath
1515
import org.junit.jupiter.api.Assertions.assertTrue
16-
import org.junit.jupiter.api.Disabled
1716
import org.junit.jupiter.api.Test
1817
import org.junit.jupiter.api.assertThrows
1918
import java.io.File
@@ -166,7 +165,6 @@ class ReplTests : AbstractSingleReplTest() {
166165
}
167166

168167
@Test
169-
@Disabled("Fix completion for this case ASAP")
170168
fun testNoCompletionAfterNumbers() {
171169
runBlocking {
172170
repl.complete("val t = 42", 10) {

0 commit comments

Comments
 (0)