Merge branch 'main' into fix/rn-build-issues

openwallet-foundation · Nov 9, 2023 · 7a110b4 · 7a110b4
2 parents 46bd4bd + 27ddf9b
commit 7a110b4
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -164,6 +164,11 @@ jobs:
         run: |
           if [ -n "${{ matrix.use_cross }}" ]; then
             cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
+            # Required for compatibility with manylinux2014.
+            # https://github.com/briansmith/ring/issues/1728
+            if [ "${{ matrix.architecture }}" = "linux-aarch64" ]; then
+              export CFLAGS="-D__ARM_ARCH=8"
+            fi
             cross build --lib --release --target ${{ matrix.target }}
           elif [ "${{ matrix.architecture }}" == "darwin-universal" ]; then
             ./build-universal.sh
@@ -427,6 +432,11 @@ jobs:
       - name: Build
         run: |
           cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
+          # Required for compatibility with manylinux2014:
+          # https://github.com/briansmith/ring/issues/1728
+          if [ "${{ matrix.target }}" = "aarch64-linux-android" ]; then
+            export CFLAGS="-D__ARM_ARCH=8"
+          fi
           cross build --lib --release --target ${{matrix.target}}
 
       - name: Upload artifacts

diff --git a/Cross.toml b/Cross.toml
@@ -1,3 +1,6 @@
+[build.env]
+passthrough = ["CFLAGS"]
+
 [target.aarch64-unknown-linux-gnu]
 image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
 

diff --git a/wrappers/javascript/.eslintrc.js b/wrappers/javascript/.eslintrc.js
@@ -70,6 +70,18 @@ module.exports = {
     ],
   },
   overrides: [
+    {
+      files: ['**/scripts/*.js'],
+      env: {
+        node: true,
+      },
+      rules: {
+        '@typescript-eslint/no-unsafe-assignment': 'off',
+        'no-console': 'off',
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/restrict-template-expressions': 'off',
+      },
+    },
     {
       files: ['.eslintrc.js', 'babel.config.js'],
       env: {

diff --git a/wrappers/javascript/aries-askar-nodejs/package.json b/wrappers/javascript/aries-askar-nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/aries-askar-nodejs",
-  "version": "0.2.0-dev.1",
+  "version": "0.2.0-dev.2",
   "license": "Apache-2.0",
   "description": "Nodejs wrapper for Aries Askar",
   "source": "src/index",
@@ -31,7 +31,7 @@
     "example": "yarn --cwd example",
     "release": "release-it",
     "test": "jest",
-    "install": "node-pre-gyp install --target_arch=$(node scripts/arch.js) --target_platform=$(node scripts/platform.js)"
+    "install": "node scripts/install.js"
   },
   "devDependencies": {
     "@types/jest": "^27.4.1",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@2060.io/ffi-napi": "4.0.8",
     "@2060.io/ref-napi": "3.0.6",
-    "@hyperledger/aries-askar-shared": "0.2.0-dev.1",
+    "@hyperledger/aries-askar-shared": "0.2.0-dev.2",
     "@mapbox/node-pre-gyp": "^1.0.10",
     "node-cache": "^5.1.2",
     "ref-array-di": "^1.2.2",

diff --git a/wrappers/javascript/aries-askar-nodejs/scripts/arch.js b/wrappers/javascript/aries-askar-nodejs/scripts/arch.js
diff --git a/wrappers/javascript/aries-askar-nodejs/scripts/install.js b/wrappers/javascript/aries-askar-nodejs/scripts/install.js
@@ -0,0 +1,15 @@
+const { execSync } = require('node:child_process')
+const { arch, platform: osPlatform } = require('os')
+
+const archTable = {
+  x64: 'x86_64',
+  arm64: 'aarch64',
+}
+
+const platform = osPlatform()
+const targetPlatform = platform === 'win32' ? 'windows' : platform
+const targetArchitecture = platform == 'darwin' ? 'universal' : archTable[arch]
+
+const command = `node-pre-gyp install --target_arch=${targetArchitecture} --target_platform=${targetPlatform}`
+
+execSync(command)
diff --git a/wrappers/javascript/aries-askar-nodejs/scripts/platform.js b/wrappers/javascript/aries-askar-nodejs/scripts/platform.js
diff --git a/wrappers/javascript/aries-askar-react-native/android/cpp-adapter.cpp b/wrappers/javascript/aries-askar-react-native/android/cpp-adapter.cpp
@@ -3,7 +3,7 @@
 #include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvokerHolder.h>
 
-#include <turboModuleUtility.h>
+#include "turboModuleUtility.h"
 
 using namespace facebook;
 

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/HostObject.cpp b/wrappers/javascript/aries-askar-react-native/cpp/HostObject.cpp
@@ -1,7 +1,8 @@
-#include <HostObject.h>
 #include <algorithm>
 #include <vector>
 
+#include "HostObject.h"
+
 AriesAskarTurboModuleHostObject::AriesAskarTurboModuleHostObject(
     jsi::Runtime &rt) {
   return;

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/HostObject.h b/wrappers/javascript/aries-askar-react-native/cpp/HostObject.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <jsi/jsi.h>
-
 #include <map>
 
-#include <ariesAskar.h>
-#include <turboModuleUtility.h>
+#include "ariesAskar.h"
+#include "turboModuleUtility.h"
 
 using namespace facebook;
 

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/ariesAskar.cpp b/wrappers/javascript/aries-askar-react-native/cpp/ariesAskar.cpp
@@ -1,6 +1,5 @@
-#include <ariesAskar.h>
-
-#include <include/libaries_askar.h>
+#include "ariesAskar.h"
+#include "include/libaries_askar.h"
 
 using namespace ariesAskarTurboModuleUtility;
 

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/ariesAskar.h b/wrappers/javascript/aries-askar-react-native/cpp/ariesAskar.h
@@ -2,8 +2,8 @@
 
 #include <jsi/jsi.h>
 
-#include <include/libaries_askar.h>
-#include <turboModuleUtility.h>
+#include "include/libaries_askar.h"
+#include "turboModuleUtility.h"
 
 using namespace facebook;
 

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/turboModuleUtility.cpp b/wrappers/javascript/aries-askar-react-native/cpp/turboModuleUtility.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <turboModuleUtility.h>
+#include "turboModuleUtility.h"
 
 namespace ariesAskarTurboModuleUtility {
 

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/turboModuleUtility.h b/wrappers/javascript/aries-askar-react-native/cpp/turboModuleUtility.h
@@ -3,8 +3,8 @@
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
 
-#include <HostObject.h>
-#include <include/libaries_askar.h>
+#include "HostObject.h"
+#include "include/libaries_askar.h"
 
 using namespace facebook;
 

diff --git a/wrappers/javascript/aries-askar-react-native/ios/AriesAskar.mm b/wrappers/javascript/aries-askar-react-native/ios/AriesAskar.mm
@@ -1,11 +1,11 @@
-#import "turboModuleUtility.h"
-
-#import "AriesAskar.h"
 #import <React/RCTBridge+Private.h>
 #import <jsi/jsi.h>
 #import <React/RCTUtils.h>
 #import <ReactCommon/RCTTurboModule.h>
 
+#import "turboModuleUtility.h"
+#import "AriesAskar.h"
+
 using namespace facebook;
 
 @implementation AriesAskar 

diff --git a/wrappers/javascript/aries-askar-react-native/package.json b/wrappers/javascript/aries-askar-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/aries-askar-react-native",
-  "version": "0.2.0-dev.1",
+  "version": "0.2.0-dev.2",
   "license": "Apache-2.0",
   "description": "React Native wrapper for Aries Askar",
   "main": "build/index",
@@ -35,7 +35,7 @@
     "install": "node-pre-gyp install"
   },
   "dependencies": {
-    "@hyperledger/aries-askar-shared": "0.2.0-dev.1",
+    "@hyperledger/aries-askar-shared": "0.2.0-dev.2",
     "@mapbox/node-pre-gyp": "^1.0.10"
   },
   "devDependencies": {

diff --git a/wrappers/javascript/aries-askar-shared/package.json b/wrappers/javascript/aries-askar-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/aries-askar-shared",
-  "version": "0.2.0-dev.1",
+  "version": "0.2.0-dev.2",
   "license": "Apache-2.0",
   "description": "Shared library for using Aries Askar with NodeJS and React Native",
   "main": "build/index",

diff --git a/wrappers/javascript/lerna.json b/wrappers/javascript/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.2.0-dev.1",
+  "version": "0.2.0-dev.2",
   "npmClient": "yarn",
   "command": {
     "version": {