Build scripts: get rid of isJetBrainsNetwork property in build script

This commit is contained in:
Alexander Zolotov
2017-04-29 01:57:45 +03:00
parent ee588faed5
commit 04648e550e
2 changed files with 1 additions and 15 deletions
-14
View File
@@ -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'
+1 -1
View File
@@ -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
}