Skip to content

Commit

Permalink
Merge pull request #4 from galaxyproteomics/wagnerr-umn-patch-2
Browse files Browse the repository at this point in the history
Fix oneJar build task
  • Loading branch information
reid-wagner authored Oct 28, 2021
2 parents 2fd5a2d + 5567456 commit 070681c
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'java'

group = 'edu.umn.msi.gx'
version = '2.1.0'
version = '2.1.1'

description = """
New mzToSQLite removing DOM reading/building and using SAX reading only.
Expand All @@ -22,7 +22,8 @@ task oneJar(type: Jar) {
'Main-Class': 'edu.umn.msi.gx.java.Main'
}
baseName = project.name
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
duplicatesStrategy = DuplicatesStrategy.INCLUDE
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
with jar
}

Expand All @@ -31,15 +32,16 @@ repositories {
mavenCentral()
}

final mztosqlite_dependencies = [
'org.apache.logging.log4j:log4j-core:2.11.0',
'org.apache.logging.log4j:log4j-api:2.11.0',
'org.xerial:sqlite-jdbc:3.21.0',
'commons-cli:commons-cli:1.4',
'org.apache.commons:commons-lang3:3.7',
'org.apache.commons:commons-math3:3.6.1'
]

dependencies {
implementation (
[
'org.apache.logging.log4j:log4j-core:2.11.0',
'org.apache.logging.log4j:log4j-api:2.11.0',
'org.xerial:sqlite-jdbc:3.21.0',
'commons-cli:commons-cli:1.4',
'org.apache.commons:commons-lang3:3.7',
'org.apache.commons:commons-math3:3.6.1'
]
)
implementation mztosqlite_dependencies
runtimeClasspath mztosqlite_dependencies
}

0 comments on commit 070681c

Please sign in to comment.