-
Notifications
You must be signed in to change notification settings - Fork 1
build: Use nextflow gradle plugin #26
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.
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
base: master
Are you sure you want to change the base?
build: Use nextflow gradle plugin #26
Conversation
57e06ee
to
eacccc7
Compare
build.gradle
Outdated
sourceSets { | ||
main { | ||
groovy { | ||
srcDirs = ['src/main/groovy'] | ||
} | ||
resources { | ||
srcDirs = ['src/main/resources'] | ||
} | ||
} | ||
test { | ||
groovy { | ||
srcDirs = ['src/test/groovy'] | ||
} | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be removed
build.gradle
Outdated
// Replace commons-logging with jcl-over-slf4j | ||
implementation 'org.slf4j:jcl-over-slf4j:2.0.7' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be removed
build.gradle
Outdated
testImplementation ("org.apache.groovy:groovy-test:4.0.23") { exclude group: 'org.apache.groovy' } | ||
testImplementation ("cglib:cglib-nodep:3.3.0") | ||
testImplementation ("org.objenesis:objenesis:3.1") | ||
testImplementation ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' } | ||
testImplementation ('org.spockframework:spock-junit4:2.3-groovy-4.0') { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' } | ||
testImplementation ('com.google.jimfs:jimfs:1.1') | ||
|
||
testImplementation(testFixtures("io.nextflow:nextflow:$nextflowVersion")) | ||
testImplementation(testFixtures("io.nextflow:nf-commons:$nextflowVersion")) | ||
// Add back Nextflow test dependencies | ||
testImplementation "io.nextflow:nextflow:${nextflowPlugin.nextflowVersion}" | ||
testImplementation(testFixtures("io.nextflow:nextflow:${nextflowPlugin.nextflowVersion}")) | ||
testImplementation(testFixtures("io.nextflow:nf-commons:${nextflowPlugin.nextflowVersion}")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think all of this can be removed
build.gradle
Outdated
configurations { | ||
// see https://docs.gradle.org/4.1/userguide/dependency_management.html#sub:exclude_transitive_dependencies | ||
runtimeClasspath.exclude group: 'org.slf4j', module: 'slf4j-api' | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be removed
build.gradle
Outdated
// AWS Athena dependencies setup - migrated from the original build.gradle | ||
apply plugin: 'de.undercouch.download' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be moved to the plugins
block at the top
settings.gradle
Outdated
// For the Nextflow plugin Gradle plugin | ||
pluginManagement { | ||
repositories { | ||
mavenLocal() | ||
gradlePluginPortal() | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be needed anymore since the nextflow gradle plugin was published to Maven Central
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please keep this on hold, until we don't have a pre-production plugin and registry
Worth to resume this now that the registry is avail |
Signed-off-by: Edmund Miller <[email protected]>
- Remove unnecessary sourceSets configuration per @bentsherman feedback - Remove explicit test dependencies (handled by plugin) - Remove SLF4J and runtime classpath exclusions - Simplify settings.gradle (remove pluginManagement block) - Keep only essential database dependencies and Athena tasks - Update to latest Nextflow Gradle plugin v1.0.0-beta.6 - Maintain full functionality while reducing complexity All tests pass and plugin builds/installs successfully. Co-authored-by: Ben Sherman <[email protected]> Signed-off-by: Edmund Miller <[email protected]>
eacccc7
to
c9d5792
Compare
This pull request refactors the build and plugin management system for the project, simplifying the
Makefile
, removing the root-levelplugins/build.gradle
, and updating Gradle settings for plugin management. The changes streamline how plugins are built, tested, installed, and released, and shift plugin configuration to a more modern Gradle setup.Follows https://www.nextflow.io/docs/latest/guides/migrate-plugin.html