Skip to content

Commit 3419b95

Browse files
committed
kotlin 2.1.0 seems to work!
1 parent c885d71 commit 3419b95

File tree

2 files changed

+36
-41
lines changed

2 files changed

+36
-41
lines changed

core/api/core.api

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6481,8 +6481,6 @@ public final class org/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords : j
64816481
public static final field EXTERNAL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
64826482
public static final field FINAL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
64836483
public static final field FUN Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6484-
public static final field HEADER Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6485-
public static final field IMPL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
64866484
public static final field IN Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
64876485
public static final field INFIX Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
64886486
public static final field INLINE Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
@@ -6536,8 +6534,6 @@ public final class org/jetbrains/kotlinx/dataframe/keywords/SoftKeywords : java/
65366534
public static final field FINAL Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
65376535
public static final field FINALLY Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
65386536
public static final field GET Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6539-
public static final field HEADER Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6540-
public static final field IMPL Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
65416537
public static final field IMPORT Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
65426538
public static final field INFIX Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
65436539
public static final field INIT Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;

plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/AbstractExplainerBlackBoxCodegenTest.kt

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,43 @@ import java.io.File
3232

3333
open class AbstractExplainerBlackBoxCodegenTest : BaseTestRunner() {
3434

35-
override fun configure(builder: TestConfigurationBuilder) =
36-
with(builder) {
37-
globalDefaults {
38-
frontend = FrontendKinds.ClassicAndFIR
39-
targetPlatform = JvmPlatforms.jvm8
40-
dependencyKind = DependencyKind.Binary
41-
targetBackend = TargetBackend.JVM_IR
42-
}
43-
defaultDirectives {
44-
JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
45-
JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_1_8
46-
+JvmEnvironmentConfigurationDirectives.WITH_REFLECT
47-
}
48-
facadeStep(::ClassicFrontendFacade)
49-
commonFirWithPluginFrontendConfiguration()
50-
classicFrontendHandlersStep {
51-
useHandlers(
52-
::ClassicDiagnosticsHandler,
53-
::DeclarationsDumpHandler,
54-
)
55-
}
56-
psi2IrStep()
57-
irHandlersStep {
58-
useHandlers(
59-
::IrPrettyKotlinDumpHandler,
60-
::IrTextDumpHandler,
61-
::IrTreeVerifierHandler,
62-
)
63-
}
64-
facadeStep(::JvmIrBackendFacade)
65-
jvmArtifactsHandlersStep {
66-
useHandlers(::JvmBoxRunner)
67-
}
68-
useConfigurators(::JvmEnvironmentConfigurator, ::CommonEnvironmentConfigurator, ::PluginAnnotationsProvider)
69-
useCustomRuntimeClasspathProviders(::MyClasspathProvider)
70-
useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
71-
useAdditionalService<TemporaryDirectoryManager>(::TemporaryDirectoryManagerImplFixed)
35+
override fun TestConfigurationBuilder.configuration() {
36+
globalDefaults {
37+
frontend = FrontendKinds.ClassicAndFIR
38+
targetPlatform = JvmPlatforms.jvm8
39+
dependencyKind = DependencyKind.Binary
40+
targetBackend = TargetBackend.JVM_IR
7241
}
42+
defaultDirectives {
43+
JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
44+
JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_1_8
45+
+JvmEnvironmentConfigurationDirectives.WITH_REFLECT
46+
}
47+
facadeStep(::ClassicFrontendFacade)
48+
commonFirWithPluginFrontendConfiguration()
49+
classicFrontendHandlersStep {
50+
useHandlers(
51+
::ClassicDiagnosticsHandler,
52+
::DeclarationsDumpHandler,
53+
)
54+
}
55+
psi2IrStep()
56+
irHandlersStep {
57+
useHandlers(
58+
::IrPrettyKotlinDumpHandler,
59+
::IrTextDumpHandler,
60+
::IrTreeVerifierHandler,
61+
)
62+
}
63+
facadeStep(::JvmIrBackendFacade)
64+
jvmArtifactsHandlersStep {
65+
useHandlers(::JvmBoxRunner)
66+
}
67+
useConfigurators(::JvmEnvironmentConfigurator, ::CommonEnvironmentConfigurator, ::PluginAnnotationsProvider)
68+
useCustomRuntimeClasspathProviders(::MyClasspathProvider)
69+
useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
70+
useAdditionalService<TemporaryDirectoryManager>(::TemporaryDirectoryManagerImplFixed)
71+
}
7372

7473
class MyClasspathProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) {
7574
override fun runtimeClassPaths(module: TestModule): List<File> =

0 commit comments

Comments
 (0)