From cf65754ea4ea3ad5a5a5d03e08241945e9ed1dd1 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 26 Mar 2021 15:21:43 +0300 Subject: [PATCH] Update 203 bunch --- build.gradle.kts | 12 ++++++++---- compiler/fir/analysis-tests/build.gradle.kts | 2 +- compiler/fir/fir2ir/build.gradle.kts | 2 +- compiler/tests-common-new/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 2 +- gradle/versions.properties.203 | 6 ++++-- libraries/scripting/js-test/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 7 ++++--- 8 files changed, 21 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bd92829fc11..ef7b38d021c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -162,7 +162,11 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks extra["IntellijCoreDependencies"] = listOf( - "asm-all-8.0.1", + when { + Platform[203].orHigher() -> "asm-all-9.0" + Platform[202].orHigher() -> "asm-all-8.0.1" + else -> "asm-all-7.0.1" + }, "guava", "jdom", "jna", @@ -862,8 +866,8 @@ tasks { ":idea-frontend-fir:idea-fir-low-level-api:test" ) } - - + + register("android-ide-tests") { dependsOn("dist") @@ -1136,4 +1140,4 @@ plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin: extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) { nodeVersion = "16.2.0" } -} \ No newline at end of file +} diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts index 33e492bdcaf..9ad16ebb222 100644 --- a/compiler/fir/analysis-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } } Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } testRuntimeOnly(toolsJar()) } diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index 26582ef0cb8..6028610fa75 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } } Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } } diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index 7899090255b..9f80435f58d 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } } Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } testRuntimeOnly(toolsJar()) } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index fbf59b1ba42..ca417c987e9 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -68,7 +68,7 @@ dependencies { testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } } Platform[203].orHigher { - testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } + testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } testCompile(intellijDep()) { includeJars( diff --git a/gradle/versions.properties.203 b/gradle/versions.properties.203 index 1d29d4e0e62..732e2a421da 100644 --- a/gradle/versions.properties.203 +++ b/gradle/versions.properties.203 @@ -1,6 +1,6 @@ -versions.intellijSdk=203-SNAPSHOT +versions.intellijSdk=203.6682.168 versions.idea.NodeJS=193.6494.7 -versions.jar.asm-all=8.0.1 +versions.jar.asm-all=9.0 versions.jar.guava=29.0-jre versions.jar.groovy=2.5.11 versions.jar.groovy-xml=2.5.11 @@ -16,3 +16,5 @@ versions.jar.lz4-java=1.7.1 ignore.jar.snappy-in-java=true versions.gradle-api=4.5.1 versions.shadow=6.1.0 +versions.junit-bom=5.7.0 +versions.org.junit.platform=1.7.0 diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 90d6c9611e1..f09a7e99778 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } } Platform[203].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } + testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 760f75cd361..f8a062af6bd 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -208,10 +208,11 @@ dependencies { fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijDep()) { includeJars("jna-platform") } - if (Platform.P202()) { + Platform[202] { fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } - } else if (Platform.P203.orHigher()) { - fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } + } + Platform[203].orHigher { + fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } } fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }