mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2025-05-05 00:34:04 +02:00
Upgrade version of kotlin to 2.0.21
This commit is contained in:
parent
8483e23ea7
commit
38102afc0f
annotation-processors
build.gradle.ktsgradle.propertiessrc/testFixtures/kotlin/org/jetbrains/plugins/ideavim
vim-engine
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
kotlin("plugin.serialization") version "2.0.0"
|
kotlin("plugin.serialization") version "2.0.21"
|
||||||
}
|
}
|
||||||
|
|
||||||
val kotlinxSerializationVersion: String by project
|
val kotlinxSerializationVersion: String by project
|
||||||
|
@ -45,7 +45,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
|
||||||
classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
|
classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
|
||||||
classpath("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")
|
classpath("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")
|
||||||
|
|
||||||
@ -66,14 +66,14 @@ buildscript {
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
kotlin("jvm") version "2.0.0"
|
kotlin("jvm") version "2.0.21"
|
||||||
application
|
application
|
||||||
id("java-test-fixtures")
|
id("java-test-fixtures")
|
||||||
id("org.jetbrains.intellij.platform") version "2.2.2-SNAPSHOT"
|
id("org.jetbrains.intellij.platform") version "2.2.2-SNAPSHOT"
|
||||||
id("org.jetbrains.changelog") version "2.2.1"
|
id("org.jetbrains.changelog") version "2.2.1"
|
||||||
id("org.jetbrains.kotlinx.kover") version "0.6.1"
|
id("org.jetbrains.kotlinx.kover") version "0.6.1"
|
||||||
id("com.dorongold.task-tree") version "4.0.0"
|
id("com.dorongold.task-tree") version "4.0.0"
|
||||||
id("com.google.devtools.ksp") version "2.0.0-1.0.23"
|
id("com.google.devtools.ksp") version "2.0.21-1.0.25"
|
||||||
}
|
}
|
||||||
|
|
||||||
val moduleSources by configurations.registering
|
val moduleSources by configurations.registering
|
||||||
|
@ -28,7 +28,7 @@ antlrVersion=4.10.1
|
|||||||
|
|
||||||
# Please don't forget to update kotlin version in buildscript section
|
# Please don't forget to update kotlin version in buildscript section
|
||||||
# Also update kotlinxSerializationVersion version
|
# Also update kotlinxSerializationVersion version
|
||||||
kotlinVersion=2.0.0
|
kotlinVersion=2.0.21
|
||||||
publishToken=token
|
publishToken=token
|
||||||
publishChannels=eap
|
publishChannels=eap
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ fun assertDoesntChange(timeInMillis: Int = 1000, condition: () -> Boolean) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun <T, S, V> Collection<T>.cartesianProduct(
|
fun <T, S, V> Collection<T>.cartesianProduct(
|
||||||
other: Iterable<S>,
|
other: Iterable<S>,
|
||||||
transformer: (first: T, second: S) -> V,
|
transformer: (first: T, second: S) -> V,
|
||||||
): List<V> {
|
): List<V> {
|
||||||
@ -97,12 +97,12 @@ internal fun <T, S, V> Collection<T>.cartesianProduct(
|
|||||||
|
|
||||||
// Cartesian product of multiple lists. Useful for making parameterized tests with all available combinations.
|
// Cartesian product of multiple lists. Useful for making parameterized tests with all available combinations.
|
||||||
// Can be used instead of @Theory from JUnit 4
|
// Can be used instead of @Theory from JUnit 4
|
||||||
internal fun productForArguments(vararg elements: List<String>): List<Arguments> {
|
fun productForArguments(vararg elements: List<String>): List<Arguments> {
|
||||||
val res = product(*elements)
|
val res = product(*elements)
|
||||||
return res.map { Arguments.of(*it.toArray(emptyArray())) }
|
return res.map { Arguments.of(*it.toArray(emptyArray())) }
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun <T> product(vararg elements: List<T>): List<List<T>> {
|
fun <T> product(vararg elements: List<T>): List<List<T>> {
|
||||||
val res = elements.fold(listOf<List<T>>(emptyList())) { acc, items ->
|
val res = elements.fold(listOf<List<T>>(emptyList())) { acc, items ->
|
||||||
acc.cartesianProduct(items) { accItems, item ->
|
acc.cartesianProduct(items) { accItems, item ->
|
||||||
accItems + item
|
accItems + item
|
||||||
@ -120,7 +120,7 @@ fun waitAndAssertMode(
|
|||||||
waitAndAssert(timeout) { fixture.editor.vim.mode == mode }
|
waitAndAssert(timeout) { fixture.editor.vim.mode == mode }
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun waitUntil(timeout: Int = 10_000, condition: () -> Boolean): Boolean {
|
fun waitUntil(timeout: Int = 10_000, condition: () -> Boolean): Boolean {
|
||||||
val timeEnd = System.currentTimeMillis() + timeout
|
val timeEnd = System.currentTimeMillis() + timeout
|
||||||
while (System.currentTimeMillis() < timeEnd) {
|
while (System.currentTimeMillis() < timeEnd) {
|
||||||
if (condition()) {
|
if (condition()) {
|
||||||
|
@ -10,8 +10,8 @@ plugins {
|
|||||||
java
|
java
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
// id("org.jlleitschuh.gradle.ktlint")
|
// id("org.jlleitschuh.gradle.ktlint")
|
||||||
id("com.google.devtools.ksp") version "2.0.0-1.0.23"
|
id("com.google.devtools.ksp") version "2.0.21-1.0.25"
|
||||||
kotlin("plugin.serialization") version "2.0.0"
|
kotlin("plugin.serialization") version "2.0.21"
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
antlr
|
antlr
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user