From 0316553a1c5f26459b04b400673d578049baab29 Mon Sep 17 00:00:00 2001
From: Emmanuel Keller <emmanuel.keller@surrealdb.com>
Date: Wed, 19 Jun 2024 17:39:14 +0100
Subject: [PATCH] Wip

---
 .github/workflows/cross.yml              | 10 ++++++----
 build.gradle                             |  5 ++++-
 src/main/java/com/surrealdb/Surreal.java |  4 +---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
index 4bd0963..55e18cb 100644
--- a/.github/workflows/cross.yml
+++ b/.github/workflows/cross.yml
@@ -39,12 +39,14 @@ jobs:
         run: cross build --target ${{ matrix.target }} --release
 
       - name: Upload so lib
+        if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target }}-build
           path: target/${{ matrix.target }}/release/*.so
 
       - name: Upload dll lib
+        if: matrix.target == 'x86_64-pc-windows-gnu'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target }}-build
@@ -166,7 +168,7 @@ jobs:
           path: build/libs/surrealdb-jni-0.2-SNAPSHOT.jar
 
       - name: Linux Integration Test
-        run: ./gradlew integrationTest
+        run: ./gradlew -i integrationTest
 
   integration-tests:
     runs-on: windows-latest
@@ -192,7 +194,7 @@ jobs:
           path: build/libs
 
       - name: Windows Integration Test
-        run: ./gradlew integrationTest
+        run: ./gradlew -i integrationTest
 
   mac-intel-integration-test:
     runs-on: macos-12
@@ -218,7 +220,7 @@ jobs:
           path: build/libs
 
       - name: Mac Integration Test
-        run: ./gradlew integrationTest
+        run: ./gradlew -i integrationTest
 
   mac-arm-integration-test:
     runs-on: macos-latest
@@ -244,4 +246,4 @@ jobs:
           path: build/libs
 
       - name: Mac Integration Test
-        run: ./gradlew integrationTest
\ No newline at end of file
+        run: ./gradlew -i integrationTest
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7881621..f61beb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,8 +92,11 @@ tasks.register('integrationTest', Test) {
     useJUnitPlatform()
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
-    systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug'
     testLogging {
         showStandardStreams = true
+        events "passed", "skipped", "failed", "standardOut", "standardError"
+        exceptionFormat = 'full'
+        showCauses = true
+        showStackTraces = true
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/surrealdb/Surreal.java b/src/main/java/com/surrealdb/Surreal.java
index bbb5351..8ff0771 100644
--- a/src/main/java/com/surrealdb/Surreal.java
+++ b/src/main/java/com/surrealdb/Surreal.java
@@ -1,11 +1,9 @@
 package com.surrealdb;
 
-import static com.surrealdb.Loader.load_native;
-
 public class Surreal implements AutoCloseable {
 
     static {
-        load_native();
+        Loader.load_native();
     }
 
     final int id;