Merge pull request #314 from semuxgo/master

Fix macOS Big Sur launch issue

.travis.yml

@@ -5,23 +5,30 @@ matrix:
     # License, formatter, and FindBugs check
     - env: NAME="License, formatter, and FindBugs check"
       os: linux
-      sudo: false
       jdk: openjdk11
       script:
         - mvn license:check
         - mvn formatter:validate
         - mvn spotbugs:check
 
     # Linux tests
-    - env: NAME="Linux tests"
+    - env: NAME="Linux tests (Java 11)"
       os: linux
-      sudo: false
       jdk: openjdk11
       services:
         - xvfb
       script:
         - mvn test
 
+    # macOS tests
+    - env: NAME="macOS tests (Java 15, Big Sur 11.1)"
+      os: osx
+      osx_image: xcode12.3
+      services:
+        - xvfb
+      script:
+        - mvn test '-Dtest=!org.semux.gui.**'
+
 cache:
   directories:
     - .autoconf

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+
+## [v2.3.x](https://github.com/semuxproject/semux-core/tree/v2.3.0) (2021-05-06)
+
+**Bug fixes:**
+- Fixed the launching issue for macOS Big Sur
+
+**Enhancements:**
+- Migrated API specs to Open API 3.0
+
+
 ## [v2.2.x](https://github.com/semuxproject/semux-core/tree/v2.2.0) (2021-04-15)
 
 This release brings in various bugfixes and enhancements to Semux Core.

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.semux</groupId>
     <artifactId>semux-core</artifactId>
-    <version>2.2.1</version>
+    <version>2.3.0</version>
     <packaging>jar</packaging>
     <description>Semux is an experimental high-performance blockchain platform that powers decentralized application.</description>
 
@@ -632,7 +632,7 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>3.13.3</version>
+            <version>5.7.2</version>
         </dependency>
 
         <!-- Apache commons -->

src/main/java/org/semux/Kernel.java

@@ -243,11 +243,7 @@ protected void printSystemInfo() {
             // memory
             GlobalMemory m = hal.getMemory();
             long mb = 1024L * 1024L;
-            logger.info("Memory: total = {} MB, available = {} MB, swap total = {} MB, swap available = {} MB",
-                    m.getTotal() / mb,
-                    m.getAvailable() / mb,
-                    m.getSwapTotal() / mb,
-                    (m.getSwapTotal() - m.getSwapUsed()) / mb);
+            logger.info("Memory: total = {} MB, available = {} MB", m.getTotal() / mb, m.getAvailable() / mb);
 
             // disk
             for (HWDiskStore disk : hal.getDiskStores()) {

src/main/java/org/semux/config/Constants.java

@@ -36,7 +36,7 @@ public class Constants {
     /**
      * Version of this client.
      */
-    public static final String CLIENT_VERSION = "2.2.1";
+    public static final String CLIENT_VERSION = "2.3.0";
 
     /**
      * Algorithm name for the 256-bit hash.

src/main/java/org/semux/crypto/Native.java

@@ -45,6 +45,9 @@ protected static void init() {
                 enabled = loadLibrary("/native/Linux-x86_64/libsemuxcrypto.so");
             }
             break;
+        case MACOS:
+            enabled = loadLibrary("/native/Darwin-x86_64/libsemuxcrypto.dylib");
+            break;
         case WINDOWS:
             enabled = loadLibrary("/native/Windows-x86_64/libsemuxcrypto.dll");
             break;

src/test/java/org/semux/crypto/NativeTest.java

@@ -6,7 +6,9 @@
  */
 package org.semux.crypto;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
 import java.time.Duration;
@@ -17,7 +19,8 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.RandomUtils;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.semux.util.Bytes;
 import org.slf4j.Logger;
@@ -39,9 +42,15 @@ public class NativeTest {
     private static final byte[] SIGNATURE = Hex
             .decode("cc52ae5b72af210073756f801cf8ffa36cefe96c5010b2cf25d04dfc5b0495e4ee3e14774c4607a4475f2b449a3181c9bd2c6aed46ed283debfebe19589f550e");
 
-    @Before
-    public void check() {
+    @BeforeClass
+    public static void setup() {
         assumeTrue(Native.isEnabled());
+        Native.disable();
+    }
+
+    @AfterClass
+    public static void teardown() {
+        Native.enable();
     }
 
     @Test(expected = CryptoException.class)