Skip to content

Commit ae621a0

Browse files
authored
Merge pull request #389 from Valter4578/develop
Dependency update | M1 support
2 parents 4249965 + a23d90b commit ae621a0

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

Example/web3swiftBrowser/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Pods/
2+

Example/web3swiftBrowser/Podfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
platform :ios, '12.0'
2-
2+
source 'https://github.com/CocoaPods/Specs.git'
33
target 'web3swiftBrowser' do
44
use_frameworks!
55
pod 'web3swift', :path => '../../'
66
end
7+
8+
post_install do |installer|
9+
installer.pods_project.build_configurations.each do |config|
10+
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
11+
end
12+
end

Example/web3swiftBrowser/Podfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
PODS:
22
- BigInt (5.2.0)
3-
- CryptoSwift (1.4.0)
4-
- PromiseKit (6.8.5):
5-
- PromiseKit/CorePromise (= 6.8.5)
6-
- PromiseKit/Foundation (= 6.8.5)
7-
- PromiseKit/UIKit (= 6.8.5)
8-
- PromiseKit/CorePromise (6.8.5)
9-
- PromiseKit/Foundation (6.8.5):
3+
- CryptoSwift (1.4.2)
4+
- PromiseKit (6.15.3):
5+
- PromiseKit/CorePromise (= 6.15.3)
6+
- PromiseKit/Foundation (= 6.15.3)
7+
- PromiseKit/UIKit (= 6.15.3)
8+
- PromiseKit/CorePromise (6.15.3)
9+
- PromiseKit/Foundation (6.15.3):
1010
- PromiseKit/CorePromise
11-
- PromiseKit/UIKit (6.8.5):
11+
- PromiseKit/UIKit (6.15.3):
1212
- PromiseKit/CorePromise
1313
- secp256k1.c (0.1.2)
14-
- Starscream (3.1.1)
14+
- Starscream (4.0.4)
1515
- web3swift (2.3.0):
16-
- BigInt (~> 5.0)
16+
- BigInt (~> 5.2)
1717
- CryptoSwift (~> 1.4.0)
18-
- PromiseKit (~> 6.8.4)
18+
- PromiseKit (~> 6.15.3)
1919
- secp256k1.c (~> 0.1)
20-
- Starscream (~> 3.1.0)
20+
- Starscream (~> 4.0.4)
2121

2222
DEPENDENCIES:
2323
- web3swift (from `../../`)
2424

2525
SPEC REPOS:
26-
trunk:
26+
https://github.com/CocoaPods/Specs:
2727
- BigInt
2828
- CryptoSwift
2929
- PromiseKit
@@ -36,12 +36,12 @@ EXTERNAL SOURCES:
3636

3737
SPEC CHECKSUMS:
3838
BigInt: f668a80089607f521586bbe29513d708491ef2f7
39-
CryptoSwift: 7cc902df1784de3b389a387756c7d710f197730c
40-
PromiseKit: 9616b0afef31eae56ab9ce044c8ec2b8612a15cd
39+
CryptoSwift: a532e74ed010f8c95f611d00b8bbae42e9fe7c17
40+
PromiseKit: 3b2b6995e51a954c46dbc550ce3da44fbfb563c5
4141
secp256k1.c: db47b726585d80f027423682eb369729e61b3b20
42-
Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
43-
web3swift: 22ac889fe28306c5d79704711f20b5ed4b21ba5e
42+
Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
43+
web3swift: dcc8da6f0944a062faa381869ce64114ddb5f8d3
4444

45-
PODFILE CHECKSUM: 0fdcb66c1e21400e017387d14550cd6ae5ef8aaa
45+
PODFILE CHECKSUM: f8f601956d8159726efe20ba4f6416842bcd191d
4646

47-
COCOAPODS: 1.10.1
47+
COCOAPODS: 1.11.0

Example/web3swiftBrowser/web3swiftBrowser.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@
409409
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
410410
CODE_SIGN_STYLE = Automatic;
411411
DEVELOPMENT_TEAM = "";
412+
"EXCLUDED_ARCHS[sdk=*]" = arm64;
412413
INFOPLIST_FILE = web3swiftBrowser/Info.plist;
413414
IPHONEOS_DEPLOYMENT_TARGET = 13.7;
414415
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -426,6 +427,7 @@
426427
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
427428
CODE_SIGN_STYLE = Automatic;
428429
DEVELOPMENT_TEAM = "";
430+
"EXCLUDED_ARCHS[sdk=*]" = arm64;
429431
INFOPLIST_FILE = web3swiftBrowser/Info.plist;
430432
IPHONEOS_DEPLOYMENT_TARGET = 13.7;
431433
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

0 commit comments

Comments
 (0)