Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix iOS Build Process: Add missing dependency and correct config files #11

Merged
merged 1 commit into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace
**/.xcode.env.local

# Android/IJ
#
Expand Down
1 change: 1 addition & 0 deletions eudi-wallet-kit-react-native.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Pod::Spec.new do |s|
s.source_files = "ios/**/*.{h,m,mm,swift}"

s.spm_dependency "eudi-lib-ios-wallet-kit/EudiWalletKit"
s.dependency "AnyCodable-FlightSchool"

# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
Expand Down
2 changes: 1 addition & 1 deletion example/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby "3.1.2"
ruby '~> 3.1'

# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
Expand Down
2 changes: 0 additions & 2 deletions example/ios/.xcode.env.local

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -688,11 +688,7 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -760,11 +756,7 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "340eabe0ef75fd45879095e0bd00d88e220c03223370ffef8cd37f242ffa2bc8",
"pins" : [
{
"identity" : "blueecc",
Expand Down Expand Up @@ -217,5 +218,5 @@
}
}
],
"version" : 2
"version" : 3
}
6 changes: 5 additions & 1 deletion example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
PODS:
- AnyCodable-FlightSchool (0.6.7)
- boost (1.83.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- eudi-wallet-kit-react-native (0.1.0):
- AnyCodable-FlightSchool
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
Expand Down Expand Up @@ -1226,6 +1228,7 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- AnyCodable-FlightSchool
- CocoaAsyncSocket
- Flipper
- Flipper-Boost-iOSX
Expand Down Expand Up @@ -1358,10 +1361,11 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AnyCodable-FlightSchool: 261cbe76757802b17d471b9059b21e6fa5edf57b
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
eudi-wallet-kit-react-native: cc05d08fd7c6123edb92c94c5714ac76acd4f045
eudi-wallet-kit-react-native: 8cc5cbe3091048007ab126cb3ab088e72ca8d8a5
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
Expand Down
8 changes: 5 additions & 3 deletions example/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import type { EudiWalletConfig } from '@openwallet-foundation/eudi-wallet-kit-react-native'

import { ClientIdSchemeType } from '@openwallet-foundation/eudi-wallet-kit-react-native'

import { EncryptionAlgorithm, EncryptionMethod } from '../../src/config/Encryption'
import {
ClientIdSchemeType,
EncryptionAlgorithm,
EncryptionMethod,
} from '@openwallet-foundation/eudi-wallet-kit-react-native'

const TRUSTED_CERT_PEM = `-----BEGIN CERTIFICATE-----
MIIDHTCCAqOgAwIBAgIUVqjgtJqf4hUYJkqdYzi+0xwhwFYwCgYIKoZIzj0EAwMw
Expand Down
2 changes: 1 addition & 1 deletion example/src/navigation/RootStack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const RootStack: React.FC = () => {
if (!isWalletInitialized) return

const listenerId = EudiWallet.addTransferEventListener((event) => {
console.log(`Received transfer event: ${event.type}`)
console.log(`Received transfer event with type: ${event.type}`)

if (event.type === TransferEventType.RequestReceived) {
const requestedDocs = event.requestedDocuments
Expand Down
1 change: 1 addition & 0 deletions ios/Sources/Model/JSDocument.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import MdocDataModel18013
import SwiftCBOR
import OrderedCollections
import AnyCodable

struct JSDocument: Encodable {
let id: String
Expand Down
Loading