Compare commits

...

27 Commits

Author SHA1 Message Date
the-real-adammork
39798dc65f update hashes 2021-10-26 14:56:28 -07:00
the-real-adammork
41d707d00d use MCO, update submodule hash 2021-10-26 14:30:50 -07:00
the-real-adammork
5a43efb71e increment pre version 2021-10-26 13:30:52 -07:00
the-real-adammork
624ac51488 update hash, increment pre version 2021-10-26 12:34:48 -07:00
the-real-adammork
77fd8e9e85 update submodule hash 2021-10-26 12:22:20 -07:00
the-real-adammork
80a46ae394 remove xcode 11 from circleCI, 12 is required for app-store submissions since April 2021 2021-10-26 10:51:07 -07:00
the-real-adammork
615bdfd6a4 update podfile and lock, need to revert to remote before merge 2021-10-24 21:42:19 -07:00
the-real-adammork
bfc37ad79c Merge remote-tracking branch 'upstream/master' into task/bitcode-pt2 2021-10-22 16:40:42 -07:00
the-real-adammork
e27046639f podfile.lock 2021-10-22 16:39:35 -07:00
the-real-adammork
b83ada0851 remove changes 2021-10-22 16:36:56 -07:00
the-real-adammork
536f13040e revert changes in Example 2021-10-22 16:31:55 -07:00
the-real-adammork
55ddf86f3a update hash 2021-10-22 16:31:11 -07:00
the-real-adammork
18e60ca16e disable bitcode on test targets 2021-10-22 16:20:01 -07:00
the-real-adammork
68a650c6c6 udpate submodule hash 2021-10-22 15:51:00 -07:00
the-real-adammork
2b5775a4c1 disable bitcode for integration tests 2021-10-22 15:46:46 -07:00
Adam Mork
95938cc253 Enable bitcode in podspec for all targets, disable bitcode on TestableRelease target so integration tests will pass. 2021-10-22 15:25:18 -07:00
the-real-adammork
d966bd8ca6 add bitcode support in Mobilecoin.podspec and in LibMobileCoin repo 2021-10-20 13:29:27 -07:00
the-real-adammork
41989a1734 go back to part1 savings 2021-10-20 13:11:30 -07:00
the-real-adammork
5bb1f4db84 update submodule hash with debug symbols 2021-10-20 12:24:26 -07:00
the-real-adammork
2be896ab79 update lock 2021-10-20 10:42:09 -07:00
the-real-adammork
3e4628d9ea keep debug symbols 2021-10-20 10:41:28 -07:00
the-real-adammork
9136167462 Merge branch 'task/update-cert' into task/size-savings-pt2 2021-10-15 15:01:35 -07:00
the-real-adammork
29db1d603c use testNet 2021-10-15 13:24:57 -07:00
the-real-adammork
23ae20f556 update code comment 2021-10-15 13:24:43 -07:00
the-real-adammork
c2d9c426db update the base64 for the trustRoot - isrgrootx1 2021-10-15 13:03:07 -07:00
the-real-adammork
60aadec7c0 update submodule commit has 2021-10-15 11:09:50 -07:00
the-real-adammork
36be1a49ea test out GCC & LTO size optimizations, make sure Example App links to our code 2021-10-15 11:08:00 -07:00
6 changed files with 44 additions and 40 deletions

View File

@ -221,7 +221,7 @@ workflows:
name: build-and-test-xcode-<< matrix.xcode-version >>
matrix:
parameters:
xcode-version: ["11.7.0", *default-xcode-version]
xcode-version: [*default-xcode-version]
#- generate-docs:
#filters:
#branches: { only: master }

View File

@ -364,7 +364,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 05E35D1FAC2827984EE8B421 /* Pods-Example.debug.xcconfig */;
buildSettings = {
"ARCHS[sdk=iphonesimulator*]" = x86_64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
@ -389,7 +388,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 3AF40DB60A0ADA2CB879AE38 /* Pods-Example.release.xcconfig */;
buildSettings = {
"ARCHS[sdk=iphonesimulator*]" = x86_64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
@ -402,7 +400,6 @@
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mobilecoin.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
@ -469,7 +466,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = FC106CAA4E993C2D6301C5CA /* Pods-Example.testable release.xcconfig */;
buildSettings = {
"ARCHS[sdk=iphonesimulator*]" = x86_64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
@ -482,7 +478,6 @@
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mobilecoin.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;

View File

@ -25,8 +25,8 @@ target 'Example' do
# pod 'MobileCoin', git: 'https://github.com/mobilecoinofficial/MobileCoin-Swift.git'
# pod 'MobileCoin/Core', git: 'https://github.com/mobilecoinofficial/MobileCoin-Swift.git', testspecs: ['Tests', 'IntegrationTests']
pod 'LibMobileCoin'
# pod 'LibMobileCoin', path: '../Vendor/libmobilecoin-ios-artifacts'
# pod 'LibMobileCoin'
pod 'LibMobileCoin', path: '../Vendor/libmobilecoin-ios-artifacts'
# pod 'LibMobileCoin', podspec: '../Vendor/libmobilecoin-ios-artifacts/LibMobileCoin.podspec'
# pod 'LibMobileCoin', git: 'https://github.com/the-real-adammork/libmobilecoin-ios-artifacts.git'
@ -81,4 +81,12 @@ post_install do |installer|
config.build_settings["OTHER_LDFLAGS"] << ' -framework "Keys"'
end
end
# Disable bitcode on test targets
installer.pods_project.targets.each do |target|
next unless ['MobileCoin-Unit-Core-IntegrationTests', 'MobileCoin-UI-Core-PerformanceTests', 'MobileCoin-Unit-Core-Tests'].find_index(target.name) != nil
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
end
end
end

View File

@ -1,6 +1,6 @@
PODS:
- _NIODataStructures (2.32.3)
- CGRPCZlib (1.4.1)
- CGRPCZlib (1.5.0)
- CNIOAtomics (2.32.3)
- CNIOBoringSSL (2.15.1)
- CNIOBoringSSLShims (2.15.1):
@ -9,8 +9,8 @@ PODS:
- CNIOHTTPParser (2.32.3)
- CNIOLinux (2.32.3)
- CNIOWindows (2.32.3)
- gRPC-Swift (1.4.1):
- CGRPCZlib (= 1.4.1)
- gRPC-Swift (1.5.0):
- CGRPCZlib (= 1.5.0)
- Logging (< 2.0.0, >= 1.4.0)
- SwiftNIO (< 3.0.0, >= 2.32.0)
- SwiftNIOExtras (< 2.0.0, >= 1.4.0)
@ -19,49 +19,49 @@ PODS:
- SwiftNIOTransportServices (< 2.0.0, >= 1.11.1)
- SwiftProtobuf (< 2.0.0, >= 1.9.0)
- Keys (1.0.1)
- LibMobileCoin (1.2.0-pre1):
- LibMobileCoin (1.2.0-pre2):
- gRPC-Swift
- SwiftProtobuf (~> 1.5)
- Logging (1.4.0)
- MobileCoin (1.2.0-pre0):
- MobileCoin/Core (= 1.2.0-pre0)
- MobileCoin/Core (1.2.0-pre0):
- MobileCoin (1.2.0-pre2):
- MobileCoin/Core (= 1.2.0-pre2)
- MobileCoin/Core (1.2.0-pre2):
- gRPC-Swift
- LibMobileCoin (~> 1.2.0-pre1)
- LibMobileCoin (~> 1.2.0-pre2)
- Logging (~> 1.4)
- SwiftLint
- SwiftNIO
- SwiftNIOHPACK
- SwiftNIOHTTP1
- SwiftProtobuf
- MobileCoin/Core/IntegrationTests (1.2.0-pre0):
- MobileCoin/Core/IntegrationTests (1.2.0-pre2):
- gRPC-Swift
- LibMobileCoin (~> 1.2.0-pre1)
- LibMobileCoin (~> 1.2.0-pre2)
- Logging (~> 1.4)
- SwiftLint
- SwiftNIO
- SwiftNIOHPACK
- SwiftNIOHTTP1
- SwiftProtobuf
- MobileCoin/Core/PerformanceTests (1.2.0-pre0):
- MobileCoin/Core/PerformanceTests (1.2.0-pre2):
- gRPC-Swift
- LibMobileCoin (~> 1.2.0-pre1)
- LibMobileCoin (~> 1.2.0-pre2)
- Logging (~> 1.4)
- SwiftLint
- SwiftNIO
- SwiftNIOHPACK
- SwiftNIOHTTP1
- SwiftProtobuf
- MobileCoin/Core/Tests (1.2.0-pre0):
- MobileCoin/Core/Tests (1.2.0-pre2):
- gRPC-Swift
- LibMobileCoin (~> 1.2.0-pre1)
- LibMobileCoin (~> 1.2.0-pre2)
- Logging (~> 1.4)
- SwiftLint
- SwiftNIO
- SwiftNIOHPACK
- SwiftNIOHTTP1
- SwiftProtobuf
- SwiftLint (0.44.0)
- SwiftLint (0.45.0)
- SwiftNIO (2.32.3):
- SwiftNIOCore (= 2.32.3)
- SwiftNIOEmbedded (= 2.32.3)
@ -118,12 +118,12 @@ PODS:
- SwiftNIOConcurrencyHelpers (< 3, >= 2.32.0)
- SwiftNIOFoundationCompat (< 3, >= 2.32.0)
- SwiftNIOTLS (< 3, >= 2.32.0)
- SwiftProtobuf (1.17.0)
- SwiftProtobuf (1.18.0)
DEPENDENCIES:
- gRPC-Swift
- Keys (from `Pods/CocoaPodsKeys`)
- LibMobileCoin
- LibMobileCoin (from `../Vendor/libmobilecoin-ios-artifacts`)
- MobileCoin (from `..`)
- MobileCoin/Core (from `..`)
- MobileCoin/Core/IntegrationTests (from `..`)
@ -144,7 +144,6 @@ SPEC REPOS:
- CNIOLinux
- CNIOWindows
- gRPC-Swift
- LibMobileCoin
- Logging
- SwiftLint
- SwiftNIO
@ -165,12 +164,14 @@ SPEC REPOS:
EXTERNAL SOURCES:
Keys:
:path: Pods/CocoaPodsKeys
LibMobileCoin:
:path: "../Vendor/libmobilecoin-ios-artifacts"
MobileCoin:
:path: ".."
SPEC CHECKSUMS:
_NIODataStructures: e2077c7dc7c1d6c93e698c85fe04d663a17f53a4
CGRPCZlib: f06b7e1530ad2e934904ffbaa86fe6353cbc9225
CGRPCZlib: db324e4e4e71262d48faceb86b52dd7d4f71ff62
CNIOAtomics: 4dde57e1838a29a9b23ef91617505f34751cdbe5
CNIOBoringSSL: c99129423da079a9eb74bcfc7cfec41a6775cf94
CNIOBoringSSLShims: 902ae35fea0b6be5eefb4fdce906751886cfa46f
@ -178,12 +179,12 @@ SPEC CHECKSUMS:
CNIOHTTPParser: f7a6816f7ddbe7dfa57a74cd36dc2db2c53b56e8
CNIOLinux: 5921dfefbc4bbe017380b34c510855622147ea41
CNIOWindows: f5aa9dfb401b440a7b4c9cd911e53e981a787193
gRPC-Swift: 88e645bc94055b11be96c704579cc00abc8af1e9
gRPC-Swift: 8942047451bf81413077e6b94bf4213e47b181cc
Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
LibMobileCoin: e2f2e79ec02c5fef095fe9f2b391805d32342d03
LibMobileCoin: 7222c364ec74eb391c37cca1e50a5874c4e5eceb
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MobileCoin: a9af68c39a6894288efa34061c6e35833f6015ed
SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
MobileCoin: e5b7cb442b60e86cf59b5568950841e48832c2f7
SwiftLint: e5c7f1fba68eccfc51509d5b2ce1699f5502e0c7
SwiftNIO: bb336ceef32850e9671d3fa0e0cc2b9add3b5948
SwiftNIOConcurrencyHelpers: ca2594e10749655f42baf5468212be83d2f94fe3
SwiftNIOCore: 9deed6620f80c7c82e8e2c2ffb9864495416d892
@ -197,8 +198,8 @@ SPEC CHECKSUMS:
SwiftNIOSSL: 7c2ddcbcbb2a8188468b7fe9c2bc6124df4b3772
SwiftNIOTLS: 1b8290ec775238ccc714ed842d929494df95a2c2
SwiftNIOTransportServices: 1fbbdb58510af3c53a838a1dbea98f18132dc952
SwiftProtobuf: 9c85136c6ba74b0a1b84279dbf0f6db8efb714e0
SwiftProtobuf: c3c12645230d9b09c72267e0de89468c5543bd86
PODFILE CHECKSUM: 31e0b21c0045109d5d94ba8ec7039ade30d37f96
PODFILE CHECKSUM: fe53a1552f381bfc9efed8667ed7c6c4d56602b1
COCOAPODS: 1.9.3

View File

@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.name = "MobileCoin"
s.version = "1.2.0-pre0"
s.version = "1.2.0-pre2"
s.summary = "A library for communicating with MobileCoin network"
s.author = "MobileCoin"
@ -32,7 +32,7 @@ Pod::Spec.new do |s|
"Sources/**/*.{h,m,swift}",
]
subspec.dependency "LibMobileCoin", "~> 1.2.0-pre1"
subspec.dependency "LibMobileCoin", "~> 1.2.0-pre2"
subspec.dependency "gRPC-Swift"
subspec.dependency "Logging", "~> 1.4"
@ -76,9 +76,9 @@ Pod::Spec.new do |s|
# intermediary frameworks. These must be speicifed here for CocoaPods to set them
# on the framework target and any testspec targets for this pod.
pod_target_xcconfig = {
# The LibMobileCoin vendored binary doesn't include support for bitcode.
"ENABLE_BITCODE" => "NO",
# The LibMobileCoin vendored binary doesn't include support for Mac Catalyst.
"GCC_OPTIMIZATION_LEVEL" => "z",
"LLVM_LTO" => "YES",
"ENABLE_BITCODE" => "YES",
"SUPPORTS_MACCATALYST" => "YES",
# The LibMobileCoin vendored binary doesn't include support for 32-bit
# architectures or for arm64 iphonesimulator.
@ -110,5 +110,5 @@ Pod::Spec.new do |s|
},
]
end
end

@ -1 +1 @@
Subproject commit 754af718c66554b45f87e4ef977653dcdf24d902
Subproject commit 7e274b2d766b8dbc646a28b5835567a02857636e