Skip to content

Commit 248dfe1

Browse files
committed
filter resolve set to remove pom entries (fixes #337)
1 parent 2ea1afa commit 248dfe1

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/main/kotlin/kscript/app/resolver/DependencyResolver.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import kscript.app.util.Logger.devMsg
77
import kscript.app.util.Logger.infoMsg
88
import java.nio.file.Path
99
import kotlin.collections.set
10+
import kotlin.io.path.extension
1011
import kotlin.script.experimental.api.valueOr
1112
import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
1213
import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
@@ -52,7 +53,11 @@ class DependencyResolver(private val customRepos: Set<Repository>) {
5253
) { it.exception?.toString() ?: it.message }, it.reports.find { it.exception != null }?.exception
5354
)
5455
}
55-
}.flatten().map { it.toPath() }.toSet()
56+
}.flatten().map {
57+
it.toPath()
58+
}.filter {
59+
it.extension == "jar"
60+
}.toSet()
5661

5762
return resolvedDependencies
5863
}

test/test_suite.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ assert 'rm -f kscriptlet* && cmd=$(kscript --package "println(args.size)" 2>&1 |
273273
#assert "echo 1" "package_me_args_1_mem_4772593664"
274274
#assert_statement 'rm -f kscriptlet* && kscript --package "println(args.size)"' "foo" "bar" 0
275275

276+
# ensure that the jar file is executable
277+
assert_raises "java -jar build/lib/kscript.jar" 0
278+
279+
276280
assert_end "$SUITE"
277281

278282
########################################################################################################################

0 commit comments

Comments
 (0)