From 04648e550e116d2a4942e57fcd5efc889ed3e9d4 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Thu, 27 Apr 2017 21:41:16 +0300 Subject: [PATCH] Build scripts: get rid of isJetBrainsNetwork property in build script --- build/dependencies/build.gradle | 14 -------------- build/dependencies/setupJdk.gradle | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/build/dependencies/build.gradle b/build/dependencies/build.gradle index e885cd5caf23..aee728d02d21 100644 --- a/build/dependencies/build.gradle +++ b/build/dependencies/build.gradle @@ -36,20 +36,6 @@ apply plugin: 'base' group 'com.intellij.build' version '1.0' -try { - project.ext.inJetBrainsNetwork = InetAddress.getByName("repo.labs.intellij.net").isReachable(1000) - if (!project.ext.inJetBrainsNetwork && org.gradle.internal.os.OperatingSystem.current().isWindows()) { - project.ext.inJetBrainsNetwork = Runtime.getRuntime().exec("ping -n 1 repo.labs.intellij.net").waitFor() == 0 - } - if (!project.ext.inJetBrainsNetwork) { - logger.info('repo.labs.intellij.net is not reachable') - } -} -catch (UnknownHostException e) { - logger.info('repo.labs.intellij.net is not reachable', e) - project.ext.inJetBrainsNetwork = false -} - apply from: 'setupJdk.gradle' apply from: 'setupJbre.gradle' apply from: 'setupKotlin.gradle' diff --git a/build/dependencies/setupJdk.gradle b/build/dependencies/setupJdk.gradle index d765f4583411..c26778801066 100644 --- a/build/dependencies/setupJdk.gradle +++ b/build/dependencies/setupJdk.gradle @@ -37,7 +37,7 @@ task downloadJdk18 { doLast { logger.info("Downloading up JDK 1.8 to compile (using $DependenciesBuildUtils.jdkRepo repo)") download { - src "$DependenciesBuildUtils.jdkRepo/intellij-jdk/${artifactName}" + src "$DependenciesBuildUtils.jdkRepo/${artifactName}" dest outputFile onlyIfNewer true }