resolved merge conflicts

Signed-off-by: wadeking98 <[email protected]>

.github/workflows/main.yaml

@@ -7,8 +7,9 @@ on:
   pull_request:
     branches: [main]
     paths:
-      - 'packages/legacy/app/ios/**'
-      - 'packages/legacy/app/android/**'
+      - 'packages/legacy/app/**'
+      - 'packages/legacy/core/**'
+      - 'packages/oca/**'
       - '**/package-lock.json'
     types: [opened, synchronize, reopened, labeled]
   push:
@@ -17,6 +18,8 @@ on:
 jobs:
   build-ios:
     runs-on: macos-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/packages/legacy/app/Gemfile
     steps:
       - uses: actions/checkout@v3
 
@@ -26,7 +29,7 @@ jobs:
       - name: Configure ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          working-directory: ./packages/legacy/app
 
       - name: Cache pod dependencies
         id: pod-cache
@@ -57,11 +60,15 @@ jobs:
           yarn install --immutable && \
           git status
 
+      - name: Build Workspace
+        run: |
+          yarn lerna run build
+
       - name: Install iOS dependencies
         # if: steps.pod-cache.outputs.cache-hit != 'true' || steps.npm-cache.outputs.cache-hit != 'true'
         working-directory: ./packages/legacy/app/ios
         run: |
-          gem install cocoapods && \
+          bundle install --frozen --gemfile=${BUNDLE_GEMFILE} && \
           pod install && \
           git status && \
           git diff Podfile.lock
@@ -140,6 +147,10 @@ jobs:
           node -v && yarn -v && yarn install --immutable && \
           git status
 
+      - name: Build Workspace
+        run: |
+          yarn lerna run build
+
       - name: Android Release Build
         working-directory: ./packages/legacy/app/android
         run: ./gradlew --no-daemon bundleRelease

.github/workflows/quality.yml

@@ -22,10 +22,9 @@ jobs:
         run: |
           yarn install --immutable
 
-      - name: Bundle Legacy Core
+      - name: Build Workspace
         run: |
-          cd packages/legacy/core && \
-          yarn run prepack
+          yarn lerna run build
 
       - name: Check style
         run: |
@@ -49,6 +48,10 @@ jobs:
         run: |
           yarn install --immutable
 
+      - name: Build Workspace
+        run: |
+          yarn lerna run build
+
       - name: Automated testing
         run: |
           yarn run test:coverage

.gitignore

@@ -176,4 +176,5 @@ lib/
 app/android/app/src/main/assets/app.bundle
 **/.yarn/cache
 **/.yarn/install-state.gz
-.xcode.env.local
+.xcode.env.local
+packages/legacy/app/vendor/bundle/**

lerna.json

@@ -2,9 +2,10 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "packages": [
     "packages/oca",
-    "packages/react-native-attestation"
+    "packages/react-native-attestation",
+    "packages/legacy/core"
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "0.0.0"
-}
+  "version": "1.0.0"
+}

package.json

@@ -33,21 +33,21 @@
     "eslint": "^8.48.0",
     "eslint-import-resolver-typescript": "^2.5.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^4.0.0",
     "lerna": "^6.6.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.4",
     "ts-node": "^10.0.0",
-    "typescript": "4.4.3"
+    "typescript": "^5.0.4"
   },
   "engines": {
     "node": ">=16.15.0 <18.0.0",
     "yarn": "^3.3.1"
   },
   "resolutions": {
-    "typescript": "^4.4.3",
-    "@typescript-eslint/parser": "6.6.0",
-    "@typescript-eslint/eslint-plugin": "6.6.0",
+    "typescript": "^5.0.4",
+    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
     "@types/react": "^18.0.24",
     "@types/react-dom": "^18.0.24",
     "@react-navigation/core": "6.1.0",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/aries-bifold-core",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "private": true,
   "main": "build/index",
   "types": "build/index",
@@ -40,18 +40,18 @@
     "test": "jest"
   },
   "peerDependencies": {
-    "react": "18.2.0",
-    "react-native": "0.71.5"
+    "react": "*",
+    "react-native": "*"
   },
   "devDependencies": {
     "@react-native-community/eslint-config": "^3.2.0",
-    "@types/jest": "^28.1.2",
-    "@types/react": "~17.0.21",
+    "@types/jest": "^29.5.5",
+    "@types/react": "^18.0.24",
     "@types/react-native": "0.71.5",
     "@types/ws": "^7.4.6",
-    "react": "18.2.0",
-    "react-native": "^0.72.4",
-    "rimraf": "^4.0.7",
-    "typescript": "4.4.3"
+    "react": "*",
+    "react-native": "*",
+    "rimraf": "^5.0.0",
+    "typescript": "^5.0.4"
   }
 }

packages/legacy/app/.ruby-version

@@ -0,0 +1 @@
+2.7.8

packages/legacy/app/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 gem 'cocoapods', '~> 1.12'
+gem 'activesupport', '~> 7.0.8'

packages/legacy/app/Gemfile.lock

@@ -0,0 +1,99 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.6)
+      rexml
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.13.0)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.13.0)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.13.0)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.6.3)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.2.2)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    ffi (1.16.3)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    minitest (5.20.0)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.7)
+    rexml (3.2.6)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.23.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 7.0.8)
+  cocoapods (~> 1.12)
+
+RUBY VERSION
+   ruby 2.7.8p225
+
+BUNDLED WITH
+   2.1.4

packages/legacy/app/ios/ariesbifold.xcodeproj/project.pbxproj

@@ -242,7 +242,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "AriesBifold" */;
+			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "ariesbifold" */;
 			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -649,6 +649,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					" ",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -717,6 +718,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					" ",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -745,7 +747,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "AriesBifold" */ = {
+		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "ariesbifold" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				83CBBA201A601CBA00E9B192 /* Debug */,

packages/legacy/app/metro.config.js

@@ -1,7 +1,12 @@
-/* eslint-disable */
-const path = require('path')
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// eslint-disable-next-line import/no-extraneous-dependencies
+const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config')
 const escape = require('escape-string-regexp')
-const packageDirs = [path.resolve(__dirname, '../core')]
+const exclusionList = require('metro-config/src/defaults/exclusionList')
+const path = require('path')
+
+const packageDirs = [path.resolve(__dirname, '../core'), path.resolve(__dirname, '../../oca')]
 
 const watchFolders = [...packageDirs]
 
@@ -22,33 +27,33 @@ for (const packageDir of packageDirs) {
   }, extraNodeModules)
 }
 
-const { getDefaultConfig } = require('metro-config')
-const exclusionList = require('metro-config/src/defaults/exclusionList')
-module.exports = (async () => {
-  const {
-    resolver: { sourceExts, assetExts },
-  } = await getDefaultConfig()
-  const metroConfig = {
-    projectRoot: path.resolve(__dirname, './'),
-    /*resetCache: true,*/
-    transformer: {
-      babelTransformerPath: require.resolve('react-native-svg-transformer'),
-      getTransformOptions: async () => ({
-        transform: {
-          experimentalImportSupport: false,
-          inlineRequires: true,
-        },
-      }),
-    },
-    resolver: {
-      blacklistRE: exclusionList(extraExclusionlist.map((m) => new RegExp(`^${escape(m)}\\/.*$`))),
-      extraNodeModules: extraNodeModules,
-      assetExts: assetExts.filter((ext) => ext !== 'svg'),
-      sourceExts: [...sourceExts, 'svg', 'cjs'],
-    },
-    watchFolders,
-  }
-  // eslint-disable-next-line no-console
-  //console.dir(metroConfig)
-  return metroConfig
-})()
+const {
+  resolver: { sourceExts, assetExts },
+} = getDefaultConfig()
+
+/**
+ * Metro configuration
+ * https://facebook.github.io/metro/docs/configuration
+ *
+ * @type {import('metro-config').MetroConfig}
+ */
+const config = {
+  transformer: {
+    babelTransformerPath: require.resolve('react-native-svg-transformer'),
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: true,
+      },
+    }),
+  },
+  resolver: {
+    blacklistRE: exclusionList(extraExclusionlist.map((m) => new RegExp(`^${escape(m)}\\/.*$`))),
+    extraNodeModules: extraNodeModules,
+    assetExts: assetExts.filter((ext) => ext !== 'svg'),
+    sourceExts: [...sourceExts, 'svg', 'cjs'],
+  },
+  watchFolders,
+}
+
+module.exports = mergeConfig(getDefaultConfig(__dirname), config)