Skip to content

Fix build when kotlin_repo_url contains local path on Windows #4501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix build when kotlin_repo_url contains local path on Windows #4501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions buildSrc/src/main/kotlin/CommunityProjectsBuild.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ fun getOverriddenKotlinLanguageVersion(project: Project): KotlinVersion? {
*
* @return an url for a kotlin compiler repository parametrized from command line nor gradle.properties, empty string otherwise
*/
fun getKotlinDevRepositoryUrl(project: Project): URI? {
fun getKotlinDevRepositoryUrl(project: Project): String? {
val url: String? = project.providers.gradleProperty("kotlin_repo_url").orNull
if (url != null) {
LOGGER.info("""Configured Kotlin Compiler repository url: '$url' for project ${project.name}""")
return URI.create(url)
return url
}
return null
}
Expand All @@ -78,9 +78,7 @@ fun getKotlinDevRepositoryUrl(project: Project): URI? {
*/
fun addDevRepositoryIfEnabled(rh: RepositoryHandler, project: Project) {
val devRepoUrl = getKotlinDevRepositoryUrl(project) ?: return
rh.maven {
url = devRepoUrl
}
rh.maven(devRepoUrl)
}

/**
Expand Down