Skip to content

fix maven open version ranges #169

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

Closed
NikkyAI wants to merge 2 commits into from
Closed

fix maven open version ranges #169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d610419
fix maven open version ranges
NikkyAI Sep 26, 2018
30d71bf
unfix //DEPS to avoid breaking legacy scripts
NikkyAI Sep 26, 2018
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: 4 additions & 4 deletions src/main/kotlin/kscript/app/Script.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private fun extractEntryPoint(line: String) = when {
line.contains(ENTRY_ANNOT_PREFIX) ->
line
.replaceFirst(ENTRY_ANNOT_PREFIX, "")
.split(")")[0].trim(' ', '"')
.substringBeforeLast(")").trim(' ', '"')
line.startsWith(ENTRY_COMMENT_PREFIX) ->
line.split("[ ]+".toRegex()).last()
else ->
Expand Down Expand Up @@ -158,13 +158,13 @@ internal fun extractDependencies(line: String) = when {
line.contains(DEPS_ANNOT_PREFIX) -> line
.replaceFirst(DEPS_ANNOT_PREFIX, "")
.extractAnnotParams()
// .split(")")[0].split(",")
// ..substringBeforeLast(")").split(",")
// .map { it.trim(' ', '"') }


line.contains(DEPSMAVEN_ANNOT_PREFIX) -> line
.replaceFirst(DEPSMAVEN_ANNOT_PREFIX, "")
.split(")")[0].trim(' ', '"').let { listOf(it) }
.substringBeforeLast(")").trim(' ', '"').let { listOf(it) }

line.startsWith(DEPS_COMMENT_PREFIX) ->
line.split("[ ;,]+".toRegex()).drop(1).map(String::trim)
Expand Down Expand Up @@ -195,7 +195,7 @@ fun Script.collectRepos(): List<MavenRepo> {
// @file:MavenRepository("imagej", "http://maven.imagej.net/content/repositories/releases/")
return lines
.filter { it.contains(dependsOnMavenPrefix) }
.map { it.replaceFirst(dependsOnMavenPrefix, "").split(")")[0] }
.map { it.replaceFirst(dependsOnMavenPrefix, "").substringBeforeLast(")") }
.map { it.split(",").map { it.trim(' ', '"', '(') }.let { MavenRepo(it[0], it[1]) } }

// todo add credential support https://stackoverflow.com/questions/36282168/how-to-add-custom-maven-repository-to-gradle
Expand Down