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

Build: Rename kotlinBuildRepo -> kotlinBuildLocalRepo

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-03-14 15:50:19 +03:00
parent a1a30ad041
commit d9b149fd2f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -302,7 +302,7 @@ allprojects {
val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString() val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
repositories { repositories {
kotlinBuildRepo(project) kotlinBuildLocalRepo(project)
mirrorRepo?.let(::maven) mirrorRepo?.let(::maven)
bootstrapKotlinRepo?.let(::maven) bootstrapKotlinRepo?.let(::maven)
jcenter() jcenter()
buildSrc/src/main/kotlin/localDependencies.kt
+5 -5
View File
@@ -26,7 +26,7 @@ import org.gradle.api.tasks.JavaExec
import org.gradle.kotlin.dsl.* import org.gradle.kotlin.dsl.*
import java.io.File import java.io.File
private fun Project.kotlinBuildRepoDir() = File("${project.rootDir.absoluteFile}/dependencies/repo") private fun Project.kotlinBuildLocalRepoDir() = File("${project.rootDir.absoluteFile}/dependencies/repo")
private fun Project.ideModuleName() = when (IdeVersionConfigurator.currentIde.kind) { private fun Project.ideModuleName() = when (IdeVersionConfigurator.currentIde.kind) {
Ide.Kind.AndroidStudio -> "android-studio-ide" Ide.Kind.AndroidStudio -> "android-studio-ide"
@@ -40,8 +40,8 @@ private fun Project.ideModuleVersion() = when (IdeVersionConfigurator.currentIde
Ide.Kind.IntelliJ -> rootProject.findProperty("versions.intellijSdk") Ide.Kind.IntelliJ -> rootProject.findProperty("versions.intellijSdk")
} }
fun RepositoryHandler.kotlinBuildRepo(project: Project): IvyArtifactRepository = ivy { fun RepositoryHandler.kotlinBuildLocalRepo(project: Project): IvyArtifactRepository = ivy {
val baseDir = project.kotlinBuildRepoDir() val baseDir = project.kotlinBuildLocalRepoDir()
setUrl(baseDir) setUrl(baseDir)
ivyPattern("${baseDir.canonicalPath}/[organisation]/[module]/[revision]/[module].ivy.xml") ivyPattern("${baseDir.canonicalPath}/[organisation]/[module]/[revision]/[module].ivy.xml")
@@ -110,7 +110,7 @@ fun ModuleDependency.includeJars(vararg names: String, rootProject: Project? = n
// Workaround. Top-level Kotlin function in a default package can't be called from a non-default package // Workaround. Top-level Kotlin function in a default package can't be called from a non-default package
object IntellijRootUtils { object IntellijRootUtils {
fun getRepositoryRootDir(project: Project): File = with(project.rootProject) { fun getRepositoryRootDir(project: Project): File = with(project.rootProject) {
return File(kotlinBuildRepoDir(), "kotlin.build") return File(kotlinBuildLocalRepoDir(), "kotlin.build")
} }
fun getIntellijRootDir(project: Project): File = with(project.rootProject) { fun getIntellijRootDir(project: Project): File = with(project.rootProject) {
@@ -139,7 +139,7 @@ fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project)
fun Project.intellijUltimateRootDir() = fun Project.intellijUltimateRootDir() =
if (isIntellijUltimateSdkAvailable()) if (isIntellijUltimateSdkAvailable())
File(kotlinBuildRepoDir(), "kotlin.build/ideaIU/${rootProject.extra["versions.intellijSdk"]}/artifacts") File(kotlinBuildLocalRepoDir(), "kotlin.build/ideaIU/${rootProject.extra["versions.intellijSdk"]}/artifacts")
else else
throw GradleException("intellij ultimate SDK is not available") throw GradleException("intellij ultimate SDK is not available")