Skip to content

Commit 2013bf5

Browse files
Address reviewer feedback and simplify build configuration
- 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]>
1 parent ccab49b commit 2013bf5

6 files changed

+4
-132
lines changed

build.gradle

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repositories {
3030
}
3131

3232
dependencies {
33-
// Latest database dependencies from master branch
33+
// Database dependencies
3434
api("org.apache.groovy:groovy-sql:4.0.26") { transitive = false }
3535
api 'com.h2database:h2:1.4.200'
3636
api 'mysql:mysql-connector-java:8.0.33'
@@ -45,21 +45,6 @@ dependencies {
4545

4646
//NOTE: Had to remove the slf4j jar due to a conflict
4747
implementation fileTree(dir: 'src/dist/lib/libs', include: '*.jar')
48-
49-
// test configuration
50-
testImplementation "org.apache.groovy:groovy:4.0.26"
51-
testImplementation "org.apache.groovy:groovy-nio:4.0.26"
52-
testImplementation ("org.apache.groovy:groovy-test:4.0.26") { exclude group: 'org.apache.groovy' }
53-
testImplementation ("cglib:cglib-nodep:3.3.0")
54-
testImplementation ("org.objenesis:objenesis:3.1")
55-
testImplementation ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' }
56-
testImplementation ('org.spockframework:spock-junit4:2.3-groovy-4.0') { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' }
57-
testImplementation ('com.google.jimfs:jimfs:1.1')
58-
59-
// see https://docs.gradle.org/4.1/userguide/dependency_management.html#sec:module_replacement
60-
modules {
61-
module("commons-logging:commons-logging") { replacedBy("org.slf4j:jcl-over-slf4j") }
62-
}
6348
}
6449

6550
nextflowPlugin {
@@ -107,6 +92,7 @@ task copyAthenDep(dependsOn: unzipAthenDep, type: Copy) {
10792
// Hook into the new plugin's build process
10893
compileGroovy.dependsOn('copyAthenDep')
10994

110-
test {
111-
useJUnitPlatform()
95+
// Configure the packagePlugin task to handle duplicates
96+
tasks.named('packagePlugin') {
97+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
11298
}

buildSrc/build.gradle

Lines changed: 0 additions & 14 deletions
This file was deleted.

buildSrc/src/main/groovy/io.nextflow.groovy-application-conventions.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle

Lines changed: 0 additions & 48 deletions
This file was deleted.

buildSrc/src/main/groovy/io.nextflow.groovy-library-conventions.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

settings.gradle

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,2 @@
1-
// For the Nextflow plugin Gradle plugin
2-
pluginManagement {
3-
repositories {
4-
mavenLocal()
5-
gradlePluginPortal()
6-
}
7-
}
8-
9-
/*
10-
* Copyright 2021, Seqera Labs
11-
*
12-
* Licensed under the Apache License, Version 2.0 (the "License");
13-
* you may not use this file except in compliance with the License.
14-
* You may obtain a copy of the License at
15-
*
16-
* http://www.apache.org/licenses/LICENSE-2.0
17-
*
18-
* Unless required by applicable law or agreed to in writing, software
19-
* distributed under the License is distributed on an "AS IS" BASIS,
20-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
21-
* See the License for the specific language governing permissions and
22-
* limitations under the License.
23-
*/
24-
plugins {
25-
// required to download the toolchain (jdk) from a remote repository
26-
// https://github.com/gradle/foojay-toolchains
27-
// https://docs.gradle.org/current/userguide/toolchains.html#sub:download_repositories
28-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
29-
}
30-
311
rootProject.name = 'nf-sqldb'
322

0 commit comments

Comments
 (0)