From 07b191f460fa430a4c29f5772ece21722d37365a Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 17 Jan 2018 20:18:26 +0300 Subject: [PATCH] Update dependency versions after migration to 173 --- compiler/android-tests/build.gradle.kts | 2 +- idea/build.gradle.kts | 4 ++-- idea/idea-android/build.gradle.kts | 2 +- idea/idea-gradle/build.gradle.kts | 2 +- ultimate/build.gradle.kts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 49d36b03985..fb636de9f2e 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":jps-plugin")) testCompile(commonDep("junit:junit")) - testCompile(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "groovy-all-2.4.6", "jps-builders") } + testCompile(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "groovy-all-2.4.12", "jps-builders") } testCompile(intellijDep("jps-standalone")) { includeJars("jps-model") } testCompile(intellijDep("jps-build-test")) } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 910a28f22c1..2f2fcec55f8 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -79,9 +79,9 @@ dependencies { testCompile(intellijPluginDep("copyright")) testCompile(intellijPluginDep("properties")) testCompile(intellijPluginDep("java-i18n")) - testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.6", "velocity", "gson-2.5", "idea_rt", "util", "log4j") } + testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.12", "velocity", "gson-2.8.2", "idea_rt", "util", "log4j") } testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) - testCompileOnly(intellijPluginDep("gradle")) { includeJars("gradle-base-services-3.5", "gradle-tooling-extension-impl", "gradle-wrapper-3.5") } + testCompileOnly(intellijPluginDep("gradle")) { includeJars("gradle-base-services-4.0", "gradle-tooling-extension-impl", "gradle-wrapper-4.0") } testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") } testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index e229b723588..b84fae5cd77 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { testCompile(projectTests(":idea:idea-gradle")) testCompile(commonDep("junit:junit")) - testCompile(intellijDep()) { includeJars("gson-2.5") } + testCompile(intellijDep()) { includeJars("gson-2.8.2") } testCompile(intellijPluginDep("properties")) testCompileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "layoutlib-api") diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 4ed220b5bb9..80f98b3a7bd 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -27,7 +27,7 @@ dependencies { testCompile(intellijPluginDep("gradle")) { includeJars("gradle-wrapper", "gradle-base-services", "gradle-tooling-extension-impl", "gradle-tooling-api", "gradle", rootProject = rootProject) } testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") } - testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.6", "idea_rt") } + testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.12", "idea_rt") } testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 51b47bdcae2..e036b9a6cd4 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -66,7 +66,7 @@ dependencies { testCompile(projectTests(":generators:test-generator")) testCompile(commonDep("junit:junit")) if (intellijUltimateEnabled) { - testCompileOnly(intellijUltimateDep()) { includeJars("gson-2.5", "annotations", "trove4j", "openapi", "idea", "util", "jdom") } + testCompileOnly(intellijUltimateDep()) { includeJars("gson-2.8.2", "annotations", "trove4j", "openapi", "idea", "util", "jdom") } } testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }