Update apache ivy version to 2.5.0

#KT-34893 fixed
This commit is contained in:
Ilya Chernikov
2019-11-15 10:46:20 +01:00
parent 4234c5ec31
commit baec10fb40
@@ -13,7 +13,7 @@ val jarBaseName = property("archivesBaseName") as String
val proguardLibraryJars by configurations.creating val proguardLibraryJars by configurations.creating
dependencies { dependencies {
compileOnly("org.apache.ivy:ivy:2.4.0") compileOnly("org.apache.ivy:ivy:2.5.0")
compileOnly(project(":compiler:cli-common")) compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-scripting-jvm-host")) compileOnly(project(":kotlin-scripting-jvm-host"))
compileOnly(project(":kotlin-script-util")) compileOnly(project(":kotlin-script-util"))
@@ -27,7 +27,7 @@ dependencies {
embedded(project(":kotlin-scripting-jvm")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
embedded(project(":kotlin-script-util")) { isTransitive = false } embedded(project(":kotlin-script-util")) { isTransitive = false }
embedded("org.apache.ivy:ivy:2.4.0") embedded("org.apache.ivy:ivy:2.5.0")
embedded(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } embedded(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
proguardLibraryJars(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar"), proguardLibraryJars(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar"),
firstFromJavaHomeThatExists("jre/lib/jsse.jar", "../Classes/jsse.jar"), firstFromJavaHomeThatExists("jre/lib/jsse.jar", "../Classes/jsse.jar"),