diff --git a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JsBoxTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JsBoxTestGenerated.java index b9b034f..41dce70 100644 --- a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JsBoxTestGenerated.java +++ b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JsBoxTestGenerated.java @@ -15,6 +15,10 @@ @TestMetadata("compiler-plugin/testData/box") @TestDataPath("$PROJECT_ROOT") public class JsBoxTestGenerated extends AbstractJsBoxTest { + private void run(String fileName) { + runTest("compiler-plugin/testData/box/" + fileName); + } + @Test public void testAllFilesPresentInBox() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -23,12 +27,12 @@ public void testAllFilesPresentInBox() { @Test @TestMetadata("anotherBoxTest.kt") public void testAnotherBoxTest() { - runTest("compiler-plugin/testData/box/anotherBoxTest.kt"); + run("anotherBoxTest.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() { - runTest("compiler-plugin/testData/box/simple.kt"); + run("simple.kt"); } } diff --git a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java index 0321cb6..c234a49 100644 --- a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java +++ b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java @@ -15,6 +15,10 @@ @TestMetadata("compiler-plugin/testData/box") @TestDataPath("$PROJECT_ROOT") public class JvmBoxTestGenerated extends AbstractJvmBoxTest { + private void run(String fileName) { + runTest("compiler-plugin/testData/box/" + fileName); + } + @Test public void testAllFilesPresentInBox() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -23,12 +27,12 @@ public void testAllFilesPresentInBox() { @Test @TestMetadata("anotherBoxTest.kt") public void testAnotherBoxTest() { - runTest("compiler-plugin/testData/box/anotherBoxTest.kt"); + run("anotherBoxTest.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() { - runTest("compiler-plugin/testData/box/simple.kt"); + run("simple.kt"); } } diff --git a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java index 406819d..73ab2d8 100644 --- a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java +++ b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java @@ -15,6 +15,10 @@ @TestMetadata("compiler-plugin/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") public class JvmDiagnosticTestGenerated extends AbstractJvmDiagnosticTest { + private void run(String fileName) { + runTest("compiler-plugin/testData/diagnostics/" + fileName); + } + @Test public void testAllFilesPresentInDiagnostics() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -23,12 +27,12 @@ public void testAllFilesPresentInDiagnostics() { @Test @TestMetadata("anotherDiagnosticTest.kt") public void testAnotherDiagnosticTest() { - runTest("compiler-plugin/testData/diagnostics/anotherDiagnosticTest.kt"); + run("anotherDiagnosticTest.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() { - runTest("compiler-plugin/testData/diagnostics/simple.kt"); + run("simple.kt"); } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8465ca4..9804542 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # https://github.com/JetBrains/kotlin -kotlin = "2.3.20" +kotlin = "2.4.0-RC" # https://github.com/Kotlin/binary-compatibility-validator kotlin-binaryCompatibilityValidator = "0.16.3" diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 40a971f..881d032 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -426,7 +426,16 @@ source-map@^0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -444,7 +453,14 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -489,7 +505,16 @@ workerpool@^9.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.3.tgz#e75281fe62e851afb21cdeef8fa85f6a62ec3583" integrity sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==