Bump to blaze v1.5.0 for scripts

fizzed · Oct 30, 2023 · 64ee63c · 64ee63c
1 parent 168c09a
commit 64ee63c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.blaze/blaze.conf b/.blaze/blaze.conf
@@ -1,7 +1,7 @@
 blaze.dependencies = [
     "com.fizzed:blaze-ssh"
-    "com.fizzed:buildx:release"
-    "com.fizzed:jne:release"
+    "com.fizzed:buildx:RELEASE"
+    "com.fizzed:jne:RELEASE"
 ]
 
 java.source.version=8
diff --git a/.blaze/blaze.java b/.blaze/blaze.java
@@ -15,7 +15,9 @@
 import java.util.stream.Collectors;
 
 import static com.fizzed.blaze.Contexts.withBaseDir;
+import static com.fizzed.blaze.Systems.cp;
 import static com.fizzed.blaze.Systems.exec;
+import static com.fizzed.blaze.util.Globber.globber;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 
@@ -47,29 +49,28 @@ public void build_natives() throws Exception {
         log.info("=================================================");
 
         log.info("Building native lib...");
+
         exec("cargo", "build", "--release", "--target="+rustTarget)
             .workingDir(rustProjectDir)
+            .verbose()
             .run();
 
-        for (String ext : asList(".so", ".dll", ".dylib")) {
-            for (Path f : Globber.globber(rustArtifactDir, "*"+ext).filesOnly().scan()) {
-                log.info("Copying {} -> {}", f, javaOutputDir);
-                Files.copy(f, javaOutputDir.resolve(f.getFileName()), StandardCopyOption.REPLACE_EXISTING);
-            }
-        }
+        cp(globber(rustArtifactDir, "*.{so,dll,dylib}")).target(javaOutputDir).force().verbose().run();
     }
 
     @Task(order=20)
     public void clean_natives() throws Exception {
         exec("cargo", "clean")
             .workingDir(rustProjectDir)
+            .verbose()
             .run();
     }
 
     @Task(order=30)
     public void test() throws Exception {
         exec("mvn", "clean", "test")
             .workingDir(projectDir)
+            .verbose()
             .run();
     }
 

diff --git a/.blaze/pom.xml b/.blaze/pom.xml
@@ -11,8 +11,8 @@
   -->
 
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
     <maven.install.skip>true</maven.install.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
@@ -23,13 +23,18 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-core</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>2.11.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.fizzed</groupId>
+      <artifactId>blaze-ivy</artifactId>
+      <version>1.4.1-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -40,11 +45,6 @@
       <artifactId>config</artifactId>
       <version>1.3.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.fizzed</groupId>
-      <artifactId>blaze-ivy</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.ivy</groupId>
       <artifactId>ivy</artifactId>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-ssh</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>

diff --git a/blaze.jar b/blaze.jar