Use quiltcore.zip

quiltdata · Jul 22, 2023 · 08c670d · 08c670d
1 parent 083e826
commit 08c670d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/plugins/nf-quilt/build.gradle b/plugins/nf-quilt/build.gradle
@@ -60,12 +60,7 @@ ext{
 
 dependencies {
     // quiltcore
-    implementation files('/home/dima/src/quiltcore-java/lib/build/libs/lib.jar')
-
-    // quiltcore dependencies - why is this necessary???
-    implementation 'software.amazon.nio.s3:aws-java-nio-spi-for-s3:1.2.3'
-    implementation 'software.amazon.awssdk:s3:2.20.102'
-    implementation 'software.amazon.awssdk:s3-transfer-manager:2.20.102'
+    implementation zipTree('../../../quiltcore-java/lib/build/distributions/quiltcore.zip')
 
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     compileOnly "io.nextflow:nextflow:$nextflowVersion"

diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy
@@ -267,9 +267,9 @@ class QuiltPackage {
     }
 
     Path install() {
-        log.info("installing $packageName ...")
-        // Path registryPath = Path.of(new URI("s3://${bucket}"))  // tries to use s3fs!
-        Path registryPath = FileHelper.asPath("s3://${bucket}")
+        log.info("installing $packageName from $bucket...")
+        Path registryPath = Path.of(new URI("s3://${bucket}"))
+        // Path registryPath = FileHelper.asPath("s3://${bucket}")
         log.info("registryPath: $registryPath")
         Registry registry = new Registry(registryPath)
         Namespace namespace = registry.getNamespace(packageName)