Skip to content

Commit 710c207

Browse files
authored
Big refactor (#12)
* refactor - use java library - remove non used code and config Signed-off-by: Jorge Aguilera <[email protected]>
1 parent 70703f7 commit 710c207

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+633
-2946
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ out
1111
_resources
1212
oracle-nomad-cluster
1313
sun-nomadlab
14+
15+
.project
16+
.classpath
17+
.settings

.project

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

plugins/.classpath

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

plugins/.project

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

plugins/.settings/org.eclipse.buildship.core.prefs

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

plugins/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ subprojects {
7777
* Creates plugin zip and json meta file in plugin `build/libs` directory
7878
*/
7979
task makeZip(type: Jar) {
80+
group 'nextflow'
81+
8082
into('classes') { with jar }
8183
into('lib') { from configurations.runtimeClasspath }
8284
manifest.from file('src/resources/META-INF/MANIFEST.MF')
@@ -105,6 +107,8 @@ subprojects {
105107
* Copy the plugin dependencies in the subproject `build/target/libs` directory
106108
*/
107109
task copyPluginLibs(type: Sync) {
110+
group 'nextflow'
111+
108112
from configurations.runtimeClasspath
109113
into 'build/target/libs'
110114
}
@@ -113,6 +117,8 @@ subprojects {
113117
* Copy the plugin in the project root build/plugins directory
114118
*/
115119
task copyPluginZip(type: Copy, dependsOn: project.tasks.findByName('makeZip')) {
120+
group 'nextflow'
121+
116122
from makeZip
117123
into "$rootProject.buildDir/plugins"
118124
outputs.file("$rootProject.buildDir/plugins/${project.name}-${project.version}.zip")
@@ -130,6 +136,8 @@ subprojects {
130136
project.parent.tasks.getByName("assemble").dependsOn << copyPluginZip
131137

132138
task uploadPlugin(type: io.nextflow.gradle.tasks.GithubUploader, dependsOn: makeZip) {
139+
group 'nextflow'
140+
133141
assets = providers.provider {["$buildDir/libs/${project.name}-${project.version}.zip",
134142
"$buildDir/libs/${project.name}-${project.version}-meta.json" ]}
135143
release = providers.provider { project.version }
@@ -150,6 +158,8 @@ classes.dependsOn subprojects.copyPluginLibs
150158
* Merge and publish the plugins index file
151159
*/
152160
task publishIndex( type: io.nextflow.gradle.tasks.GithubRepositoryPublisher ) {
161+
group 'nextflow'
162+
153163
indexUrl = 'https://github.com/nextflow-io/plugins/main/plugins.json'
154164
repos = allPlugins()
155165
owner = github_organization

plugins/nf-nomad/.classpath

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

plugins/nf-nomad/.project

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

plugins/nf-nomad/.settings/org.eclipse.buildship.core.prefs

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

plugins/nf-nomad/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ dependencies {
8888
}
8989

9090
testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3'
91+
testImplementation(testFixtures("io.nextflow:nextflow:$nextflowVersion"))
92+
testImplementation(testFixtures("io.nextflow:nf-commons:$nextflowVersion"))
9193
}
9294

9395
// use JUnit 5 platform

0 commit comments

Comments
 (0)