From a9280cdbcda6dcbe8349b1f4c73b58f1a1d53501 Mon Sep 17 00:00:00 2001 From: Cuihtlauac ALVARADO Date: Thu, 18 Jan 2018 17:01:38 +0100 Subject: [PATCH] Add support for proxies to scripts Update jcabi-aether dependency from 0.10.1 to 1.0-SNAPSHOT. In order to do that, add https://oss.sonatype.org/content/repositories/snapshots to the repositories in tools/kotlin-script-util/build.gradle.kts Script dependencies are resolved using jcabi-aether. Unfortunately "stable" release (0.10.1) does not support proxies. Therefore, script dependencies are not pulled behind a proxy. Issue is fixed in SNAPSHOT release of jcabi-aether. FIXED: KT-22363 --- libraries/tools/kotlin-script-util/build.gradle.kts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index ba14ab8c09d..e2b1dcedf19 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -6,6 +6,10 @@ plugins { id("jps-compatible") } +repositories { + maven(url = "https://oss.sonatype.org/content/repositories/snapshots") // for jcabi-aether:1.0-SNAPSHOT +} + dependencies { compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) @@ -13,7 +17,7 @@ dependencies { compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:daemon-common")) compile(projectRuntimeJar(":kotlin-daemon-client")) - compileOnly("com.jcabi:jcabi-aether:0.10.1") + compileOnly("com.jcabi:jcabi-aether:1.0-SNAPSHOT") compileOnly("org.sonatype.aether:aether-api:1.13.1") compileOnly("org.apache.maven:maven-core:3.0.3") testCompileOnly(project(":compiler:cli")) @@ -21,7 +25,7 @@ dependencies { testRuntime(project(":kotlin-reflect")) testCompile(commonDep("junit:junit")) testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) - testRuntime("com.jcabi:jcabi-aether:0.10.1") + testRuntime("com.jcabi:jcabi-aether:1.0-SNAPSHOT") testRuntime("org.sonatype.aether:aether-api:1.13.1") testRuntime("org.apache.maven:maven-core:3.0.3") compileOnly(intellijDep()) { includeJars("openapi", "util") }