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

Update 203 bunch

Browse Source
This commit is contained in:
Yan Zhulanow
2021-03-26 15:21:43 +03:00
committed by Dmitriy Novozhilov
parent ccc3e3510c
commit cf65754ea4
8 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+8 -4
View File
@@ -162,7 +162,11 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks
extra["IntellijCoreDependencies"] = extra["IntellijCoreDependencies"] =
listOf( 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", "guava",
"jdom", "jdom",
"jna", "jna",
@@ -862,8 +866,8 @@ tasks {
":idea-frontend-fir:idea-fir-low-level-api:test" ":idea-frontend-fir:idea-fir-low-level-api:test"
) )
} }
register("android-ide-tests") { register("android-ide-tests") {
dependsOn("dist") 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) { extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) {
nodeVersion = "16.2.0" nodeVersion = "16.2.0"
} }
} }
compiler/fir/analysis-tests/build.gradle.kts
+1 -1
View File
@@ -40,7 +40,7 @@ dependencies {
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} }
Platform[203].orHigher { 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()) testRuntimeOnly(toolsJar())
} }
compiler/fir/fir2ir/build.gradle.kts
+1 -1
View File
@@ -44,7 +44,7 @@ dependencies {
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} }
Platform[203].orHigher { Platform[203].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
} }
} }
compiler/tests-common-new/build.gradle.kts
+1 -1
View File
@@ -32,7 +32,7 @@ dependencies {
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} }
Platform[203].orHigher { 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()) testRuntimeOnly(toolsJar())
} }
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -68,7 +68,7 @@ dependencies {
testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} }
Platform[203].orHigher { 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()) { testCompile(intellijDep()) {
includeJars( includeJars(
gradle/versions.properties.203
+4 -2
View File
@@ -1,6 +1,6 @@
versions.intellijSdk=203-SNAPSHOT versions.intellijSdk=203.6682.168
versions.idea.NodeJS=193.6494.7 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.guava=29.0-jre
versions.jar.groovy=2.5.11 versions.jar.groovy=2.5.11
versions.jar.groovy-xml=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 ignore.jar.snappy-in-java=true
versions.gradle-api=4.5.1 versions.gradle-api=4.5.1
versions.shadow=6.1.0 versions.shadow=6.1.0
versions.junit-bom=5.7.0
versions.org.junit.platform=1.7.0
libraries/scripting/js-test/build.gradle.kts
+1 -1
View File
@@ -24,7 +24,7 @@ dependencies {
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} }
Platform[203].orHigher { Platform[203].orHigher {
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
} }
} }
prepare/compiler/build.gradle.kts
+4 -3
View File
@@ -208,10 +208,11 @@ dependencies {
fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
fatJarContents(intellijDep()) { includeJars("jna-platform") } fatJarContents(intellijDep()) { includeJars("jna-platform") }
if (Platform.P202()) { Platform[202] {
fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") } 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) } fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) }