Skip to content

Commit c3bb7a5

Browse files
authored
Fix lineage packaging (#6001) [ci skip]
Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
1 parent 92a47ec commit c3bb7a5

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

modules/nextflow/build.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ compileGroovy {
1717
options.compilerArgs = ['-XDignore.symbol.file']
1818
}
1919

20+
configurations {
21+
lineageImplementation
22+
}
23+
2024
dependencies {
2125
api(project(':nf-commons'))
2226
api(project(':nf-httpfs'))
@@ -59,7 +63,8 @@ dependencies {
5963
testFixturesApi ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy' }
6064
testFixturesApi ('org.spockframework:spock-junit4:2.3-groovy-4.0') { exclude group: 'org.apache.groovy' }
6165
testFixturesApi 'com.google.jimfs:jimfs:1.2'
62-
66+
// note: declare as separate dependency to avoid a circular dependency
67+
lineageImplementation (project(':nf-lineage'))
6368
}
6469

6570

@@ -77,10 +82,16 @@ run{
7782
}
7883

7984
shadowJar {
85+
// add 'lineage' because it cannot be added to this project
86+
// explicitly otherwise it will result into a circular dependency
87+
configurations = [project.configurations.runtimeClasspath, project.configurations.lineageImplementation]
8088
archiveClassifier='one'
8189
manifest {
8290
attributes 'Main-Class': "$mainClassName"
8391
}
8492
mergeServiceFiles()
8593
mergeGroovyExtensionModules()
94+
transform(com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer) {
95+
resource = 'META-INF/extensions.idx'
96+
}
8697
}

0 commit comments

Comments
 (0)