Skip to content
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.

Sign up for GitHub

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

Remove snappy #1571

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Remove snappy #1571

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ configurations {
exclude group: 'xalan', module: 'serializer'
exclude group: 'xalan', module: 'xalan'

exclude group: 'org.xerial.snappy', module: 'snappy-java'

// Amazon deps exclusions
//exclude group: 'software.amazon', module: 'flow'
//exclude group: 'software.amazon.awssdk', module: 'annotations'
Expand All @@ -122,7 +124,7 @@ dependencies {
[group: 'org.apache.commons', name: 'commons-compress', version: '1.26.0'],
[group: 'org.apache.commons', name: 'commons-jexl', version: '2.1.1'],
[group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'],
[group: 'com.github.samtools', name: 'htsjdk', version: '4.1.1'],
[group: 'com.github.samtools', name: 'htsjdk', version: '4.1.2'],
[group: 'org.swinglabs', name: 'swing-layout', version: '1.0.3'],
[group: 'com.formdev', name: 'jide-oss', version: '3.7.12'],
[group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'],
Expand Down Expand Up @@ -359,7 +361,8 @@ tasks.register('createMacAppWithJavaDistZip', Zip) {
}
}

task createWinDist(type: Copy, dependsOn: createDist) {
tasks.register('createWinDist', Copy) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed these in the 21 update branch.

dependsOn createDist
with copySpec {
from("${buildDir}/IGV-dist") {
exclude "*.sh"
Expand Down Expand Up @@ -440,7 +443,8 @@ tasks.register('signWinExeDist', Exec) {
}
}

task signWinExeWithJavaDist(type: Exec, dependsOn: createWinWithJavaExeDist) {
tasks.register('signWinExeWithJavaDist', Exec) {
dependsOn createWinWithJavaExeDist
standardInput = new ByteArrayInputStream(keyPassword.getBytes());
commandLine(signcodeCommand, "-spc", spcFile, "-v", pvkFile, "-a", "sha512",
"-\$", "commercial", "-n", "IGV ${version}", "-i", "http://www.igv.org/",
Expand All @@ -452,7 +456,8 @@ task signWinExeWithJavaDist(type: Exec, dependsOn: createWinWithJavaExeDist) {
}
}

task fullJar(type: Jar, dependsOn: jar) {
tasks.register('fullJar', Jar) {
dependsOn jar
// Based on https://discuss.gradle.org/t/removing-dependencies-from-a-jar-file-during-jar-task/5521/3
from {
((configurations.compile - configurations.default) + "${buildDir}/libs/igv.jar").collect {
Expand Down
Loading