Skip to content

Commit 8ad0466

Browse files
authored
Merge pull request #342 from AdamaJava/nanno_snp_eff_idea
fix(qannotate): snpeff records were not being dealt with correctly
2 parents 95fd119 + 5b5a0f1 commit 8ad0466

File tree

63 files changed

+3724
-3897
lines changed

Some content is hidden

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

63 files changed

+3724
-3897
lines changed

build.gradle

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,24 @@ subprojects {
6363
main { java.srcDirs=['src']; resources.srcDirs=['src'] }
6464
test { java.srcDirs=['test']; test.resources.srcDirs=['test'] }
6565
}
66+
build.doLast {
67+
println "${project}: copy ${configurations.runtimeClasspath.collect { File file -> file.name }} to ${adamalib} and build/flat"
68+
copy { from configurations.runtimeClasspath,libsDirectory; into file('build/flat') }
69+
copy { from configurations.runtimeClasspath,libsDirectory; into adamalib }
70+
}
71+
jar.doFirst {
72+
manifest {
73+
if(project.hasProperty('mainClassName') && project.getProperty('mainClassName') != null ) {
74+
attributes 'Main-Class' : project.mainClassName
75+
}
76+
attributes 'Implementation-Title': project.name,
77+
'Implementation-Version': verionId,
78+
'SVN-Version': revision,
79+
'Built-By': System.properties['user.name'],
80+
'Date': new java.util.Date().toString(),
81+
'Class-Path' : project.configurations.runtimeClasspath.collect { it.name }.join(' ')
82+
}
83+
}
6684
}
6785

6886
//create adama/build/lib under root before subprojects build

q3indel/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
implementation project(':qpicard')
2121

2222
implementation 'org.scala-lang:scala-library:2.12.18'
23-
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
23+
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
2424
implementation group: 'org.ini4j', name: 'ini4j', version: '0.5.2'
2525
}
2626

q3panel/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212

1313
implementation 'org.apache.commons:commons-lang3:3.4'
1414
implementation 'net.sf.trove4j:core:3.1.0'
15-
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
15+
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
1616
implementation 'com.github.samtools:htsjdk:4.0.2'
1717

1818
implementation group: 'com.io7m.xom',name: 'xom', version: '1.2.10'

q3tiledaligner/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ dependencies {
1212
implementation 'com.github.samtools:htsjdk:4.0.2'
1313
implementation 'net.sf.trove4j:core:3.1.0'
1414
implementation 'org.apache.commons:commons-lang3:3.4'
15-
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
15+
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
1616
}

q3vcftools/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
implementation project(':qio')
1616

1717
implementation 'com.github.samtools:htsjdk:4.0.2'
18-
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
18+
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
1919
implementation 'net.sf.trove4j:core:3.1.0'
2020
implementation group: 'com.jcraft', name: 'jsch', version: '0.1.54'
2121
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'

q3vcftools/src/au/edu/qimr/vcftools/AmalgamatorGS.java

Lines changed: 66 additions & 91 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)