azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Use cache-redirector.jetbrains.com to prevent connection timeouts

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-09-21 11:51:22 +03:00
parent a8aab3fbe5
commit d11fbac511
23 changed files with 132 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/dictionaries/4u7.xml
Generated
+1
View File
@@ -3,6 +3,7 @@
<words>
<w>cidr</w>
<w>foldable</w>
<w>redirector</w>
</words>
</dictionary>
</component>
build.gradle.kts
+4 -4
View File
@@ -15,10 +15,10 @@ buildscript {
kotlinBootstrapFrom(BootstrapOption.TeamCity("1.3.20-dev-564", onlySuccessBootstrap = false))
repositories {
repositories.withRedirector(project) {
bootstrapKotlinRepo?.let(::maven)
maven("https://plugins.gradle.org/m2")
}
}
// a workaround for kotlin compiler classpath in kotlin project: sometimes gradle substitutes
// kotlin-stdlib external dependency with local project :kotlin-stdlib in kotlinCompilerClasspath configuration.
@@ -261,13 +261,13 @@ allprojects {
val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
repositories {
repositories.withRedirector(project) {
intellijSdkRepo(project)
androidDxJarRepo(project)
mirrorRepo?.let(::maven)
bootstrapKotlinRepo?.let(::maven)
jcenter()
}
}
configureJvmProject(javaHome!!, jvmTarget!!)
buildSrc/build.gradle.kts
+14 -5
View File
@@ -1,11 +1,17 @@
buildscript {
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion)
val buildSrcKotlinRepo: String? by extra(findProperty("buildSrc.kotlin.repo") as String?)
extra["versions.shadow"] = "2.0.2"
extra["versions.native-platform"] = "0.14"
repositories {
if (cacheRedirectorEnabled) {
maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com")
}
buildSrcKotlinRepo?.let {
maven(url = it)
}
@@ -17,6 +23,8 @@ buildscript {
}
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
logger.info("buildSrcKotlinVersion: " + extra["buildSrcKotlinVersion"])
logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
@@ -58,8 +66,6 @@ val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY
val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild)
val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository"
extra["intellijReleaseType"] = if (extra["versions.intellijSdk"]?.toString()?.endsWith("SNAPSHOT") == true)
"snapshots"
else
@@ -70,9 +76,14 @@ extra["versions.androidDxSources"] = "5.0.0_r2"
extra["customDepsOrg"] = "kotlin.build.custom.deps"
repositories {
if (cacheRedirectorEnabled) {
maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com")
}
extra["buildSrcKotlinRepo"]?.let {
maven(url = it)
}
jcenter()
}
@@ -81,9 +92,7 @@ dependencies {
compile("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
compile("net.rubygrapefruit:native-platform-windows-i386:${property("versions.native-platform")}")
compile("com.jakewharton.dex:dex-method-list:3.0.0")
// TODO: adding the dep to the plugin breaks the build unexpectedly, resolve and uncomment
// compile("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}")
// Shadow plugin is used in many projects of the main build. Once it's no longer used in buildSrc, please move this dependency to the root project
compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
compile("org.ow2.asm:asm-all:6.0_BETA")
}
buildSrc/gradle.properties
+2
View File
@@ -3,5 +3,7 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
#buildSrc.kotlin.repo=https://jcenter.bintray.com
#buildSrc.kotlin.version=1.1.50
buildSrc/gradle.properties.as31
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
#buildSrc.kotlin.repo=https://jcenter.bintray.com
#buildSrc.kotlin.version=1.1.50
buildSrc/gradle.properties.as32
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
#buildSrc.kotlin.repo=https://jcenter.bintray.com
#buildSrc.kotlin.version=1.1.50
buildSrc/gradle.properties.as33
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
#buildSrc.kotlin.repo=https://jcenter.bintray.com
#buildSrc.kotlin.version=1.1.50
buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
+9 -3
View File
@@ -7,9 +7,9 @@ import org.gradle.api.publish.ivy.internal.publisher.IvyDescriptorFileGenerator
import java.io.File
import org.gradle.internal.os.OperatingSystem
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
val intellijUltimateEnabled: Boolean by rootProject.extra
val intellijRepo: String by rootProject.extra
val intellijReleaseType: String by rootProject.extra
val intellijVersion = rootProject.extra["versions.intellijSdk"] as String
val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelease") as String?
@@ -56,8 +56,14 @@ repositories {
}
}
}
maven { setUrl("$intellijRepo/$intellijReleaseType") }
maven { setUrl("https://plugins.jetbrains.com/maven") }
if (cacheRedirectorEnabled) {
maven("https://cache-redirector.jetbrains.com/www.jetbrains.com/intellij-repository/$intellijReleaseType")
maven("https://cache-redirector.jetbrains.com/plugins.jetbrains.com/maven")
}
maven("https://www.jetbrains.com/intellij-repository/$intellijReleaseType")
maven("https://plugins.jetbrains.com/maven")
}
val intellij by configurations.creating
buildSrc/settings.gradle
+12
View File
@@ -1,3 +1,15 @@
pluginManagement {
repositories {
if (cacheRedirectorEnabled == 'true') {
maven {
url "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2"
}
}
gradlePluginPortal()
}
}
include "prepare-deps:android-dx",
"prepare-deps:intellij-sdk"
buildSrc/src/main/kotlin/jbCacheRedirector.kt
+57
View File
@@ -0,0 +1,57 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
import org.gradle.api.Project
import org.gradle.api.artifacts.dsl.RepositoryHandler
import org.gradle.api.artifacts.repositories.MavenArtifactRepository
import java.net.URI
// https://youtrack.jetbrains.com/issue/ADM-23180
val mirroredUrls = listOf(
"https://dl.bintray.com/groovy/maven",
"https://dl.bintray.com/kotlin/kotlin-dev",
"https://dl.bintray.com/kotlin/kotlin-eap",
"https://dl.google.com/dl/android/maven2",
"https://dl.google.com/go",
"https://download.jetbrains.com",
"https://jcenter.bintray.com",
"https://jetbrains.bintray.com/dekaf",
"https://jetbrains.bintray.com/intellij-jdk",
"https://jetbrains.bintray.com/intellij-plugin-service",
"https://jetbrains.bintray.com/intellij-third-party-dependencies",
"https://jetbrains.bintray.com/markdown",
"https://jetbrains.bintray.com/teamcity-rest-client",
"https://jetbrains.bintray.com/test-discovery",
"https://jitpack.io",
"https://maven.exasol.com/artifactory/exasol-releases",
"https://plugins.gradle.org/m2",
"https://plugins.jetbrains.com/maven",
"https://repo.grails.org/grails/core",
"https://repo.jenkins-ci.org/releases",
"https://repo.spring.io/milestone",
"https://repo1.maven.org/maven2",
"https://services.gradle.org",
"https://www.jetbrains.com/intellij-repository",
"https://www.myget.org/F/intellij-go-snapshots/maven",
"https://www.myget.org/F/rd-snapshots/maven"
)
fun URI.toCacheRedirectorUri() = URI("https://cache-redirector.jetbrains.com/$host/$path")
fun RepositoryHandler.redirect() = filterIsInstance<MavenArtifactRepository>().forEach { repository ->
val uri = repository.url
if (uri.toString().trimEnd('/') in mirroredUrls) {
repository.url = uri.toCacheRedirectorUri()
}
}
fun Project.cacheRedirectorEnabled(): Boolean = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
fun RepositoryHandler.withRedirector(project: Project, configuration: RepositoryHandler.() -> Unit) {
configuration()
if (project.cacheRedirectorEnabled()) {
redirect()
}
}
compiler/psi/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ plugins {
id("jps-compatible")
}
repositories {
repositories.withRedirector(project) {
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
}
gradle.properties
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
kotlin.compiler.effectSystemEnabled=true
kotlin.compiler.newInferenceEnabled=true
#maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
gradle.properties.as31
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
kotlin.compiler.effectSystemEnabled=true
kotlin.compiler.newInferenceEnabled=true
#maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
gradle.properties.as32
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
kotlin.compiler.effectSystemEnabled=true
kotlin.compiler.newInferenceEnabled=true
#maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
gradle.properties.as33
+2
View File
@@ -3,6 +3,8 @@ org.gradle.parallel=false
org.gradle.configureondemand=false
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
cacheRedirectorEnabled=true
kotlin.compiler.effectSystemEnabled=true
kotlin.compiler.newInferenceEnabled=true
#maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
idea/build.gradle.kts
+2 -2
View File
@@ -5,8 +5,8 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
repositories.withRedirector(project) {
maven("https://jetbrains.bintray.com/markdown")
}
dependencies {
idea/build.gradle.kts.173
+2 -2
View File
@@ -5,8 +5,8 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
repositories.withRedirector(project) {
maven("https://jetbrains.bintray.com/markdown")
}
dependencies {
idea/build.gradle.kts.as31
+2 -2
View File
@@ -5,8 +5,8 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
repositories.withRedirector(project) {
maven("https://jetbrains.bintray.com/markdown")
}
dependencies {
idea/build.gradle.kts.as32
+2 -2
View File
@@ -5,8 +5,8 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
repositories.withRedirector(project) {
maven("https://jetbrains.bintray.com/markdown")
}
dependencies {
idea/build.gradle.kts.as33
+2 -2
View File
@@ -5,8 +5,8 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
repositories.withRedirector(project) {
maven("https://jetbrains.bintray.com/markdown")
}
dependencies {
plugins/imports-dumper/build.gradle.kts
+2 -2
View File
@@ -6,8 +6,8 @@ plugins {
id("jps-compatible")
}
repositories {
maven("http://dl.bintray.com/kotlin/kotlinx")
repositories.withRedirector(project) {
maven("https://dl.bintray.com/kotlin/kotlinx")
}
val kotlinxSerializationVersion = "0.4.2"
prepare/idea-plugin/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
maven("https://jetbrains.bintray.com/markdown")
}
// Do not rename, used in JPS importer
settings.gradle
+5
View File
@@ -8,6 +8,11 @@ pluginManagement {
}
gradlePluginPortal()
}
if (cacheRedirectorEnabled == 'true') {
println("cache-redirector is enabled for pluginManagement")
JbCacheRedirectorKt.redirect(repositories)
}
}
// modules