Skip to content

Commit

Permalink
fix gradle tasks issues
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Aguilera <[email protected]>
  • Loading branch information
jagedn committed Feb 29, 2024
1 parent a395aa0 commit b3b5a92
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SourcesMatcher {
}
matcher.collect { file ->
def source = file.toString() - "$root.absolutePath/src/main/"
return source.split('\\.').dropRight(1).join().split(File.separator).drop(1).join('.')
return source.split('\\.').dropRight(1).join().split(File.separator).join('.')
}
}

Expand Down
15 changes: 15 additions & 0 deletions plugins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ subprojects {
mavenCentral()
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(19)
}
}

compileJava {
options.release.set(11)
}

tasks.withType(GroovyCompile) {
sourceCompatibility = '11'
targetCompatibility = '11'
}

tasks.withType(Jar) {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
Expand Down
12 changes: 12 additions & 0 deletions plugins/nf-nomad/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,15 @@ test {
jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
}

jar {
manifest {
attributes(
'Manifest-Version':'1.0',
'Plugin-Id': project.name,
'Plugin-Version': archiveVersion,
'Plugin-Class': "nextflow.nomad.NomadPlugin",
'Plugin-Provider': 'nextflow',
'Plugin-Requires': '>=23.10.0',
)
}
}
7 changes: 0 additions & 7 deletions plugins/nf-nomad/src/resources/META-INF/MANIFEST.MF

This file was deleted.

2 changes: 0 additions & 2 deletions plugins/nf-nomad/src/resources/META-INF/extensions.idx

This file was deleted.

0 comments on commit b3b5a92

Please sign in to comment.