Find the optimized jar with pattern

icon-project · Dec 21, 2023 · c3d60b2 · c3d60b2
1 parent 57b7891
commit c3d60b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/e2edemo/scripts/icon/jar.ts b/e2edemo/scripts/icon/jar.ts
@@ -2,14 +2,21 @@ import fs from 'fs';
 import path from 'path';
 
 export class Jar {
-  public static readFromFile(base: string | undefined, project: string, version: string = '0.1.0') {
+  public static readFromFile(base: string | undefined, project: string, version?: string) {
     if (!base) {
       base = "../javascore";
     }
     const build = "build/libs";
+    const basedir = path.join(base, project, build);
     const name = project.replace("/", "-");
-    const optJar = `${name}-${version}-optimized.jar`;
-    const fullPath = path.join(base, project, build, optJar);
+    let optJar;
+    if (version) {
+      optJar = `${name}-${version}-optimized.jar`;
+    } else {
+      const files = fs.readdirSync(basedir);
+      optJar = files.filter(f => f.match(`${name}\\-[\\d.]+\\-optimized.jar`))[0];
+    }
+    const fullPath = path.join(basedir, optJar);
     return fs.readFileSync(fullPath).toString('hex')
   }
 }
diff --git a/e2edemo/scripts/setup/deploy_xcall.ts b/e2edemo/scripts/setup/deploy_xcall.ts
@@ -7,7 +7,7 @@ const deployments = Deployments.getDefault();
 
 async function deploy_xcall_java(target: string, chain: any) {
   const iconNetwork = IconNetwork.getNetwork(target);
-  const content = Jar.readFromFile(JAVASCORE_PATH, "xcall", "0.6.2");
+  const content = Jar.readFromFile(JAVASCORE_PATH, "xcall");
   const xcall = new Contract(iconNetwork)
   const deployTxHash = await xcall.deploy({
     content: content,