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

202: Update dependencies

Browse Source
This commit is contained in:
Nikolay Krasko
2020-06-04 18:04:39 +03:00
parent 8485532856
commit cc709a2ef9
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+4 -1
View File
@@ -200,7 +200,10 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks
extra["IntellijCoreDependencies"] = extra["IntellijCoreDependencies"] =
listOf( listOf(
"asm-all-7.0.1", when {
Platform[202].orHigher() -> "asm-all-8.0.1"
else -> "asm-all-7.0.1"
},
"guava", "guava",
"jdom", "jdom",
"jna", "jna",
buildSrc/build.gradle.kts
+1 -1
View File
@@ -105,7 +105,7 @@ dependencies {
implementation("com.github.jengelman.gradle.plugins:shadow:${rootProject.extra["versions.shadow"]}") implementation("com.github.jengelman.gradle.plugins:shadow:${rootProject.extra["versions.shadow"]}")
implementation("net.sf.proguard:proguard-gradle:6.2.2") implementation("net.sf.proguard:proguard-gradle:6.2.2")
implementation("org.jetbrains.intellij.deps:asm-all:7.0.1") implementation("org.jetbrains.intellij.deps:asm-all:8.0.1")
implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5") implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5")
} }
compiler/android-tests/build.gradle.kts
+7 -1
View File
@@ -29,7 +29,13 @@ dependencies {
testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) } testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
} }
testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) } testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
Platform[202].orHigher {
testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
}
Platform[201].orLower {
testCompile(intellijDep()) { includeJars("groovy-all", rootProject = rootProject) }
}
Platform[192].orHigher { Platform[192].orHigher {
testCompile(intellijPluginDep("java")) { includeJars("jps-builders") } testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
} }
gradle/versions.properties.202
+2 -2
View File
@@ -1,9 +1,9 @@
versions.intellijSdk=202.5103-EAP-CANDIDATE-SNAPSHOT versions.intellijSdk=202.5103-EAP-CANDIDATE-SNAPSHOT
versions.androidBuildTools=r23.0.1 versions.androidBuildTools=r23.0.1
versions.idea.NodeJS=193.6494.7 versions.idea.NodeJS=193.6494.7
versions.jar.asm-all=7.0.1 versions.jar.asm-all=8.0.1
versions.jar.guava=29.0-jre versions.jar.guava=29.0-jre
versions.jar.groovy-all=2.4.17 versions.jar.groovy=2.5.11
versions.jar.lombok-ast=0.2.3 versions.jar.lombok-ast=0.2.3
versions.jar.swingx-core=1.6.2-2 versions.jar.swingx-core=1.6.2-2
versions.jar.kxml2=2.3.0 versions.jar.kxml2=2.3.0