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.

Sign up for GitHub

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

v1.2.0-pre0 - Network Robustness, Fog 1.2.0, Apple Silicon/M1 & Mac Catalyst, LibMobileCoin v1.2.0-pre1 #73

Merged
merged 56 commits into from
Sep 17, 2021
Merged

v1.2.0-pre0 - Network Robustness, Fog 1.2.0, Apple Silicon/M1 & Mac Catalyst, LibMobileCoin v1.2.0-pre1 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
dea6c39
update to my fork
the-real-adammork Jun 23, 2021
fd82edb
use fork
the-real-adammork Jun 23, 2021
87a78ca
update MrEnclave values
the-real-adammork Jun 23, 2021
f199ada
update gitmodules to my forks, update mrEnclave values
the-real-adammork Jun 23, 2021
602086a
Merge branch 'master' of github.com:the-real-adammork/MobileCoin-Swift
the-real-adammork Jun 23, 2021
20324aa
change to m1 branch
the-real-adammork Aug 19, 2021
56f86ff
Change podfile in Example Project
the-real-adammork Aug 19, 2021
57a6b43
change tag value
the-real-adammork Aug 19, 2021
63e5600
update submodule commit hash
the-real-adammork Aug 19, 2021
8e201de
update submodule
the-real-adammork Aug 19, 2021
7d689b4
update sub
the-real-adammork Aug 19, 2021
7608023
change name of proto type to match changes in fog commit 18f8cab4d535…
the-real-adammork Aug 19, 2021
4fdaf13
new comit
the-real-adammork Aug 19, 2021
9ed4308
only active arch
the-real-adammork Aug 19, 2021
5b413ed
comit
the-real-adammork Aug 19, 2021
34d517b
based of alx/nr, WIP
the-real-adammork Aug 25, 2021
82f62ab
add converted grpc -> http bindings for consensus_client and ledger
the-real-adammork Aug 25, 2021
c571e05
Squashed Changes
the-real-adammork Sep 3, 2021
6fdda47
uptick dependency versions
the-real-adammork Sep 4, 2021
498e656
delete lock file, remove version requirements from podspec for testing
the-real-adammork Sep 4, 2021
99d6e9f
working w/ arch specific binaries (not stripped)
the-real-adammork Sep 6, 2021
74b26b3
update libmobilecoin
the-real-adammork Sep 7, 2021
108b17e
not working WIP
the-real-adammork Sep 7, 2021
ed9721c
wip trying to get prem1 working
the-real-adammork Sep 7, 2021
e87bdea
working solution
the-real-adammork Sep 7, 2021
0f5d556
remove extra arch exclusions
the-real-adammork Sep 7, 2021
2d988e8
Update commitment code to use correct solution. remove some debug
the-real-adammork Sep 8, 2021
2409b55
remove comments and debug code
the-real-adammork Sep 8, 2021
dea08e6
remove Cert Pinning WIP class
the-real-adammork Sep 8, 2021
08cb5ec
HTTP Requester Cleanup
the-real-adammork Sep 8, 2021
de82159
gs
the-real-adammork Sep 8, 2021
34f84d2
Cleanup HttpRequester remove unused and unecc. code. Breakout types i…
the-real-adammork Sep 8, 2021
e17468c
Tighten up HTTP errors
the-real-adammork Sep 8, 2021
df0ad01
More cleanup for SwiftLintgs
the-real-adammork Sep 8, 2021
bc4887f
match libmobilecoin repo
the-real-adammork Sep 8, 2021
6d7935c
reset back to m1/compressed commitment working and then keep all new …
the-real-adammork Sep 14, 2021
72a6480
fix FixtureData path to be compatible with new submodule configuratio…
the-real-adammork Sep 14, 2021
42f6d9b
update version numbers, remove failing unit test, update serialized d…
the-real-adammork Sep 16, 2021
f8627d3
point to v1.2.0-pre0
the-real-adammork Sep 16, 2021
be1a52b
Update Podfile.lock, enable catalyst support in the podspec, remove a…
Sep 16, 2021
4ae1845
update hash
the-real-adammork Sep 16, 2021
3b4d317
update podspec
the-real-adammork Sep 16, 2021
7ff087f
merge from remote
the-real-adammork Sep 16, 2021
4d4c9d6
have dependency point to different remote
the-real-adammork Sep 16, 2021
184082f
remove git refinement
the-real-adammork Sep 16, 2021
377b804
update lockfile, and update submodule hash
the-real-adammork Sep 16, 2021
ead36a2
remove cocoapods-binary not used anymore
the-real-adammork Sep 16, 2021
27fa6fc
update podfile with checksum from pod install --deployment
the-real-adammork Sep 16, 2021
607e5b9
unlock grpc, add bridging header, update cocoapods
the-real-adammork Sep 17, 2021
41920ca
use official
the-real-adammork Sep 17, 2021
8154ee0
use LibMobileCoin v1.2.0-pre1, updated lockfile, updated submodule hash
the-real-adammork Sep 17, 2021
e4551e1
updated lock
the-real-adammork Sep 17, 2021
5b0010e
point to cocoapods version of LibMobileCoin
the-real-adammork Sep 17, 2021
ca3be63
delete lockfile
the-real-adammork Sep 17, 2021
f369c5d
update lockfile
the-real-adammork Sep 17, 2021
3bbdc0c
remove docs from circle-ci
the-real-adammork Sep 17, 2021
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
18 changes: 9 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ jobs:
- print-tool-versions
- run: make build
- run: make test
- run: make docs
- run: make lint-docs
#- run: make docs
#- run: make lint-docs
- store_artifacts: { path: output }
- store_test_results: { path: output/scan }
- store_artifacts: { path: ~/Library/Logs/DiagnosticReports }
Expand Down Expand Up @@ -222,10 +222,10 @@ workflows:
matrix:
parameters:
xcode-version: ["11.7.0", *default-xcode-version]
- generate-docs:
filters:
branches: { only: master }
- deploy-docs:
requires: [ build-and-test, generate-docs ]
filters:
branches: { only: master }
#- generate-docs:
#filters:
#branches: { only: master }
#- deploy-docs:
#requires: [ build-and-test, generate-docs ]
#filters:
#branches: { only: master }
11 changes: 10 additions & 1 deletion Example/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand Down Expand Up @@ -364,17 +364,20 @@
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\"";
DEVELOPMENT_TEAM = 8JT9JJD9Y5;
ENABLE_ONLY_ACTIVE_RESOURCES = NO;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.mobilecoin.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -386,17 +389,20 @@
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\"";
DEVELOPMENT_TEAM = 8JT9JJD9Y5;
ENABLE_ONLY_ACTIVE_RESOURCES = NO;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mobilecoin.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -463,17 +469,20 @@
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\"";
DEVELOPMENT_TEAM = 8JT9JJD9Y5;
ENABLE_ONLY_ACTIVE_RESOURCES = NO;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mobilecoin.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down
5 changes: 4 additions & 1 deletion Example/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ GIT
fourflusher (~> 2.0)
xcpretty (~> 0.3.0)

GEM
specs:

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -290,4 +293,4 @@ DEPENDENCIES
fastlane!

BUNDLED WITH
2.1.4
2.2.24
11 changes: 5 additions & 6 deletions Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ source 'https://cdn.cocoapods.org/'
platform :ios, '10.0'

plugin 'cocoapods-repo-update'
plugin 'cocoapods-binary'
keep_source_code_for_prebuilt_frameworks!
plugin 'cocoapods-keys', {
:project => "MobileCoin",
Expand All @@ -26,14 +25,14 @@ 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', binary: true
pod 'LibMobileCoin'
# pod 'LibMobileCoin', path: '../Vendor/libmobilecoin-ios-artifacts'
# pod 'LibMobileCoin', podspec: '../Vendor/libmobilecoin-ios-artifacts/LibMobileCoin.podspec'
# pod 'LibMobileCoin', git: 'https://github.com/mobilecoinofficial/libmobilecoin-ios-artifacts.git'
# pod 'LibMobileCoin', git: 'https://github.com/the-real-adammork/libmobilecoin-ios-artifacts.git'

pod 'gRPC-Swift', binary: true
pod 'SwiftProtobuf', binary: true
pod 'SwiftLint', binary: true
pod 'gRPC-Swift'
pod 'SwiftProtobuf'
pod 'SwiftLint'
end

post_install do |installer|
Expand Down
Loading