Merge pull request #123 from aionnetwork/dev

v1.0.0
aionnetwork · Jul 5, 2018 · e446419 · e446419
2 parents a8ff53c + dc7e911
commit e446419
Show file tree

Hide file tree

Showing 187 changed files with 7,808 additions and 999 deletions.
diff --git a/build.xml b/build.xml
@@ -60,7 +60,7 @@
         <javac
                 debuglevel="source,lines,vars"
                 includeantruntime="false"
-                release="9"
+                release="10"
                 srcdir="${src.test}"
                 destdir="${out.test}"
                 includes="**/*Test.java"
@@ -102,7 +102,7 @@
         <javac
                 debuglevel="source,lines,vars"
                 includeantruntime="false"
-                release="9"
+                release="10"
                 srcdir="./"
                 destdir="${out.main}"
                 excludes="src/main/java/org/aion/connector/api/**/*.java"
@@ -136,7 +136,7 @@
         <javac
                 debuglevel="source,lines,vars"
                 includeantruntime="false"
-                release="9"
+                release="10"
                 srcdir="./"
                 destdir="${out.main}"
                 excludes="src/main/java/org/aion/wallet/connector/core/**/*.java"

diff --git a/lib/BIP39-0.1.9.jar b/lib/BIP39-0.1.9.jar
diff --git a/lib/SHA256-0.0.1.jar b/lib/SHA256-0.0.1.jar
diff --git a/lib/ToRuntime-0.9.0.jar b/lib/ToRuntime-0.9.0.jar
diff --git a/lib/core-3.3.3.jar b/lib/core-3.3.3.jar
diff --git a/lib/jsr305-3.0.2.jar b/lib/jsr305-3.0.2.jar
diff --git a/lib/modAionApi-v0.1.5.7095c5f-2018-04-16.jar b/lib/modAionApi-v0.1.5.7095c5f-2018-04-16.jar
diff --git a/lib/modAionApi-v0.1.9.75f2e8c-2018-06-14.jar b/lib/modAionApi-v0.1.9.75f2e8c-2018-06-14.jar
diff --git a/mod/modCrypto.jar b/mod/modCrypto.jar
diff --git a/mod/modMcf.jar b/mod/modMcf.jar
diff --git a/module-info.java b/module-info.java
@@ -12,6 +12,7 @@
     requires javafx.base;
     requires javafx.graphics;
     requires javafx.controls;
+    requires javafx.swing;
     requires java.desktop;
     requires slf4j.api;
     requires guava;

diff --git a/scripts/aion_ui.sh b/scripts/aion_ui.sh
@@ -2,8 +2,10 @@
 
 SCRIPT_PATH=$(dirname $(realpath $0))
 
-pushd ${SCRIPT_PATH}
+cd ${SCRIPT_PATH}
 
-java -cp "${SCRIPT_PATH}/mod/*:${SCRIPT_PATH}/lib/*" org.aion.wallet.WalletApplication
+MOD_DIR=${SCRIPT_PATH}/mod/*
+LIB_DIR=${SCRIPT_PATH}/lib/*
+STORAGE_DIR=${HOME}/.aion
 
-popd
+java -cp "${MOD_DIR}:${LIB_DIR}" -Dlocal.storage.dir=${STORAGE_DIR} -Xms300m -Xmx500m org.aion.wallet.WalletApplication