File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
dependencies-maven/src/kotlin/script/experimental/dependencies/maven/impl Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,11 @@ noDefaultJar()
4242sourcesJar()
4343javadocJar()
4444
45+ val mavenPackagesToRelocate = listOf (
46+ " org.eclipse" ,
47+ " org.codehaus"
48+ )
49+
4550val relocatedJar by task<ShadowJar > {
4651 configurations = listOf (embedded)
4752 duplicatesStrategy = DuplicatesStrategy .INCLUDE
@@ -51,7 +56,7 @@ val relocatedJar by task<ShadowJar> {
5156 transform(ComponentsXmlResourceTransformerPatched ())
5257
5358 if (kotlinBuildProperties.relocation) {
54- packagesToRelocate.forEach {
59+ ( packagesToRelocate + mavenPackagesToRelocate) .forEach {
5560 relocate(it, " $kotlinEmbeddableRootPackage .$it " )
5661 }
5762 }
Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ internal class AetherResolveSession(
245245 ): Settings {
246246 var main = result.effectiveSettings
247247 val files = File (System .getProperty(" user.dir" ))
248- .parentFile.listFiles(
248+ .parentFile? .listFiles(
249249 NameFileFilter (" interpolated-settings.xml" ) as FileFilter
250250 )
251251 val settingsFile = files?.singleOrNull()
You can’t perform that action at this time.
0 commit comments