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

Refactor build repositories to reduce number of unnecessary request

Browse Source 
Setup for all projects only local, jcenter and bootstrap repositories
This commit is contained in:
Vyacheslav Gerasimov
2018-08-24 21:34:34 +03:00
parent ca5b19d0c6
commit bc544d764a
11 changed files with 84 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+14 -47
View File
@@ -15,25 +15,9 @@ buildscript {
kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.70-dev-491", onlySuccessBootstrap = false))
val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
val repos = listOfNotNull(
mirrorRepo,
bootstrapKotlinRepo,
"https://jcenter.bintray.com/",
"https://plugins.gradle.org/m2",
"http://dl.bintray.com/kotlin/kotlinx",
"https://repo.gradle.org/gradle/ext-releases-local", // for native-platform
"https://jetbrains.bintray.com/intellij-third-party-dependencies", // for jflex
"https://dl.bintray.com/jetbrains/markdown" // for org.jetbrains:markdown
)
extra["repos"] = repos
repositories {
for (repo in repos) {
maven(url = repo)
}
bootstrapKotlinRepo?.let(::maven)
maven("https://plugins.gradle.org/m2")
}
// a workaround for kotlin compiler classpath in kotlin project: sometimes gradle substitutes
@@ -42,10 +26,10 @@ buildscript {
val bootstrapCompilerClasspath by configurations.creating
dependencies {
bootstrapCompilerClasspath(kotlinDep("compiler-embeddable", bootstrapKotlinVersion))
bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
classpath("com.gradle.publish:plugin-publish-plugin:0.9.7")
classpath(kotlinDep("gradle-plugin", bootstrapKotlinVersion))
classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
classpath("net.sf.proguard:proguard-gradle:5.3.3")
}
}
@@ -90,19 +74,9 @@ allprojects {
extra["kotlin_root"] = rootDir
val bootstrapCompileCfg = configurations.create("bootstrapCompile")
repositories {
for (repo in (rootProject.extra["repos"] as List<String>)) {
maven(url = repo)
}
}
val cidrKotlinPlugin by configurations.creating
dependencies {
bootstrapCompileCfg(kotlinDep("compiler-embeddable", bootstrapKotlinVersion))
cidrKotlinPlugin(project(":prepare:cidr-plugin", "runtimeJar"))
}
@@ -180,17 +154,6 @@ extra["IntellijCoreDependencies"] =
"streamex",
"trove4j")
extra["nativePlatformVariants"] =
listOf("windows-amd64",
"windows-i386",
"osx-amd64",
"osx-i386",
"linux-amd64",
"linux-i386",
"freebsd-amd64-libcpp",
"freebsd-amd64-libstdcpp",
"freebsd-i386-libcpp",
"freebsd-i386-libstdcpp")
extra["compilerModules"] = arrayOf(
":compiler:util",
@@ -295,19 +258,23 @@ allprojects {
// therefore it is disabled by default
// buildDir = File(commonBuildDir, project.name)
val repos = rootProject.extra["repos"] as List<String>
val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
repositories {
intellijSdkRepo(project)
androidDxJarRepo(project)
for (repo in repos) {
maven(repo)
}
mirrorRepo?.let(::maven)
bootstrapKotlinRepo?.let(::maven)
jcenter()
}
configureJvmProject(javaHome!!, jvmTarget!!)
val commonCompilerArgs = listOfNotNull("-Xallow-kotlin-package", "-Xread-deserialized-contracts", "-Xprogressive".takeIf { hasProperty("test.progressive.mode") })
val commonCompilerArgs = listOfNotNull(
"-Xallow-kotlin-package",
"-Xread-deserialized-contracts",
"-Xprogressive".takeIf { hasProperty("test.progressive.mode") }
)
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions {
compiler/daemon/daemon-client/build.gradle.kts
+17 -1
View File
@@ -7,9 +7,24 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://repo.gradle.org/gradle/ext-releases-local")
}
jvmTarget = "1.6"
val nativePlatformVariants: List<String> by rootProject.extra
val nativePlatformVariants = listOf(
"windows-amd64",
"windows-i386",
"osx-amd64",
"osx-i386",
"linux-amd64",
"linux-i386",
"freebsd-amd64-libcpp",
"freebsd-amd64-libstdcpp",
"freebsd-i386-libcpp",
"freebsd-i386-libstdcpp"
)
dependencies {
compileOnly(project(":compiler:util"))
@@ -40,6 +55,7 @@ runtimeJar(task<ShadowJar>("shadowJar")) {
}
sourcesJar()
javadocJar()
dist()
compiler/daemon/daemon-client/build.gradle.kts.173
+17 -1
View File
@@ -7,9 +7,24 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://repo.gradle.org/gradle/ext-releases-local")
}
jvmTarget = "1.6"
val nativePlatformVariants: List<String> by rootProject.extra
val nativePlatformVariants = listOf(
"windows-amd64",
"windows-i386",
"osx-amd64",
"osx-i386",
"linux-amd64",
"linux-i386",
"freebsd-amd64-libcpp",
"freebsd-amd64-libstdcpp",
"freebsd-i386-libcpp",
"freebsd-i386-libstdcpp"
)
dependencies {
compileOnly(project(":compiler:util"))
@@ -39,6 +54,7 @@ runtimeJar(task<ShadowJar>("shadowJar")) {
}
sourcesJar()
javadocJar()
dist()
compiler/psi/build.gradle.kts
+3
View File
@@ -9,6 +9,9 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
}
jvmTarget = "1.6"
idea/build.gradle.kts
+5 -1
View File
@@ -5,6 +5,10 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
}
dependencies {
testRuntime(intellijDep())
@@ -38,11 +42,11 @@ dependencies {
compile(project(":kotlin-script-util")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains", "markdown"))
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
compileOnly(intellijPluginDep("copyright"))
idea/build.gradle.kts.173
+5 -1
View File
@@ -5,6 +5,10 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
}
dependencies {
testRuntime(intellijDep())
@@ -38,11 +42,11 @@ dependencies {
compile(project(":kotlin-script-util")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains", "markdown"))
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
compileOnly(intellijPluginDep("copyright"))
idea/build.gradle.kts.as31
+5 -1
View File
@@ -5,6 +5,10 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
}
dependencies {
testRuntime(intellijDep())
@@ -38,11 +42,11 @@ dependencies {
compile(project(":kotlin-script-util")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains", "markdown"))
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
compileOnly(intellijPluginDep("copyright"))
idea/build.gradle.kts.as32
+5 -1
View File
@@ -5,6 +5,10 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
}
dependencies {
testRuntime(intellijDep())
@@ -38,11 +42,11 @@ dependencies {
compile(project(":kotlin-script-util")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains", "markdown"))
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
compileOnly(intellijPluginDep("copyright"))
idea/build.gradle.kts.as33
+5 -1
View File
@@ -5,6 +5,10 @@ plugins {
id("jps-compatible")
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
}
dependencies {
testRuntime(intellijDep())
@@ -38,11 +42,11 @@ dependencies {
compile(project(":kotlin-script-util")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains", "markdown"))
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
compileOnly(intellijPluginDep("copyright"))
plugins/imports-dumper/build.gradle.kts
+4
View File
@@ -6,6 +6,10 @@ plugins {
id("jps-compatible")
}
repositories {
maven("http://dl.bintray.com/kotlin/kotlinx")
}
val kotlinxSerializationVersion = "0.4.2"
dependencies {
prepare/idea-plugin/build.gradle.kts
+4
View File
@@ -7,6 +7,10 @@ plugins {
`java-base`
}
repositories {
maven("https://dl.bintray.com/jetbrains/markdown")
}
// Do not rename, used in JPS importer
val projectsToShadow by extra(listOf(
":plugins:annotation-based-compiler-plugins-ide-support",