azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Native][tests] Don't use trove4j in K/N new test infra

Browse Source
This commit is contained in:
Dmitriy Dolovov
2023-08-08 14:17:08 +02:00
committed by Space Team
parent ce9a45bf92
commit da2e6d93ff
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/build.gradle.kts
-1
View File
@@ -24,7 +24,6 @@ dependencies {
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-metadata-klib")) testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-metadata-klib"))
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil")) testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
} }
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt
+1 -2
View File
@@ -5,13 +5,12 @@
package org.jetbrains.kotlin.konan.blackboxtest.support.settings package org.jetbrains.kotlin.konan.blackboxtest.support.settings
import gnu.trove.THashMap
import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
import kotlin.reflect.KClass import kotlin.reflect.KClass
internal abstract class Settings(private val parent: Settings?, settings: Iterable<Any>) { internal abstract class Settings(private val parent: Settings?, settings: Iterable<Any>) {
private val map: Map<KClass<*>, Any> = THashMap<KClass<*>, Any>().apply { private val map: Map<KClass<*>, Any> = buildMap {
settings.forEach { settings.forEach {
val settingClass: KClass<*> val settingClass: KClass<*>
val setting: Any val setting: Any
repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+1 -2
View File
@@ -252,8 +252,7 @@ class CodeConformanceTest : TestCase() {
"native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt", "native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt",
"native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt", "native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt",
"native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt", "native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt",
"native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt", "native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt"
"native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt"
) )
) { _, source -> ) { _, source ->
"gnu.trove" in source "gnu.trove" in source