diff --git a/gradle/versions.properties.193 b/gradle/versions.properties.193 index f27c61569d2..effd4dc3ba5 100644 --- a/gradle/versions.properties.193 +++ b/gradle/versions.properties.193 @@ -1,4 +1,4 @@ -versions.intellijSdk=193.4697-EAP-CANDIDATE-SNAPSHOT +versions.intellijSdk=193.4778.7-EAP-SNAPSHOT versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=181.3494.12 versions.jar.asm-all=7.0.1 @@ -11,6 +11,6 @@ versions.jar.streamex=0.6.8 versions.jar.gson=2.8.5 versions.jar.oro=2.0.8 versions.jar.picocontainer=1.2 -versions.jar.teamcity-service-messages=2019.1.4-alpha +versions.jar.serviceMessages=2019.1.4 ignore.jar.snappy-in-java=true versions.gradle-api=4.5.1 diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 035195e099e..23d353d6afe 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -65,31 +65,15 @@ dependencies { runtime(project(":kotlin-reflect")) jarContents(compileOnly(intellijDep()) { - includeJars("asm-all", "gson", rootProject = rootProject) + includeJars("asm-all", "gson", "serviceMessages", rootProject = rootProject) }) - jarContents(compileOnly(intellijDep()) { - if (Platform.P193.orHigher()) { - includeJars("teamcity-service-messages", rootProject = rootProject) - } else { - includeJars("serviceMessages", rootProject = rootProject) - } - }) - - // com.android.tools.build:gradle has ~50 unneeded transitive dependencies compileOnly("com.android.tools.build:gradle:3.0.0") { isTransitive = false } compileOnly("com.android.tools.build:gradle-core:3.0.0") { isTransitive = false } compileOnly("com.android.tools.build:builder-model:3.0.0") { isTransitive = false } - testCompile(intellijDep()) { includeJars( "junit", rootProject = rootProject) } - testCompile(intellijDep()) { - if (Platform.P193.orHigher()) { - includeJars("teamcity-service-messages", rootProject = rootProject) - } else { - includeJars("serviceMessages", rootProject = rootProject) - } - } + testCompile(intellijDep()) { includeJars( "junit", "serviceMessages", rootProject = rootProject) } testCompileOnly(project(":compiler")) testCompile(projectTests(":kotlin-build-common"))