diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 349893bc..dac065ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,4 @@ name: Continuous Integration - on: push: branches: @@ -10,7 +9,6 @@ on: branches: - master - develop - jobs: build: name: Build @@ -20,7 +18,7 @@ jobs: run: | brew install automake - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive @@ -48,13 +46,17 @@ jobs: xcode-version: '15.4' - name: Rustup add targets run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim - - name: Dependencies + - name: Build dependencies working-directory: ./dashsync/Example run: pod install --repo-update --verbose - - name: Build + - name: Build for iOS Simulator (without code signing) working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} + scheme: ${{ 'DashSync-Example' }} platform: ${{ 'iOS Simulator' }} run: | - xcodebuild build -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" + xcodebuild build \ + -scheme "DashSync-Example" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO \ No newline at end of file diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 172ddfba..6504c8e6 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -18,7 +18,7 @@ jobs: run: | brew install automake - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive diff --git a/.github/workflows/e2eTestsTestnet.yml b/.github/workflows/e2eTestsTestnet.yml index 5592daf8..debb9919 100644 --- a/.github/workflows/e2eTestsTestnet.yml +++ b/.github/workflows/e2eTestsTestnet.yml @@ -20,7 +20,7 @@ jobs: run: | brew install automake - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive @@ -48,17 +48,25 @@ jobs: - name: Dependencies working-directory: ./dashsync/Example run: pod install --repo-update - - name: Build + - name: Build for testing (with ad-hoc code signing) working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} + scheme: ${{ 'DashSync-Example' }} platform: ${{ 'iOS Simulator' }} run: | - xcodebuild build-for-testing -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" + xcodebuild build-for-testing \ + -scheme "DashSync-Example" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + CODE_SIGN_IDENTITY="-" CODE_SIGNING_REQUIRED=YES CODE_SIGNING_ALLOWED=YES - name: Test Syncing Chain working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} + scheme: ${{ 'DashSync-Example' }} platform: ${{ 'iOS Simulator' }} run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan TestnetE2ETests + xcodebuild test-without-building \ + -scheme "DashSync-Example" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan TestnetE2ETests \ No newline at end of file diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f92e7d6a..2afc376d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: run: | brew install automake - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive diff --git a/.github/workflows/network.yml b/.github/workflows/network.yml index 753b49d4..342edf1b 100644 --- a/.github/workflows/network.yml +++ b/.github/workflows/network.yml @@ -17,7 +17,7 @@ jobs: run: | brew install automake - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive @@ -44,7 +44,7 @@ jobs: run: cargo install cargo-lipo - name: Rustup add targets run: rustup target add x86_64-apple-darwin - - name: Dependencies + - name: Build Dependencies working-directory: ./dashsync/Example run: pod install --repo-update - name: Cache network info build @@ -71,7 +71,9 @@ jobs: run: | ./NetworkInfo -outputDir ~/ - name: Archive network ping results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 # Updated to v4 with: name: testnet-network-report path: ~/networkHealth.json + retention-days: 30 + compression-level: 6 # Default, adjust as needed \ No newline at end of file diff --git a/.github/workflows/syncTestMainnet.yml b/.github/workflows/syncTestMainnet.yml index 7e12492f..54aa929e 100644 --- a/.github/workflows/syncTestMainnet.yml +++ b/.github/workflows/syncTestMainnet.yml @@ -19,7 +19,7 @@ jobs: run: | brew install automake - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive diff --git a/.github/workflows/syncTestTestnet.yml b/.github/workflows/syncTestTestnet.yml index 85c69d42..d5570361 100644 --- a/.github/workflows/syncTestTestnet.yml +++ b/.github/workflows/syncTestTestnet.yml @@ -29,7 +29,7 @@ jobs: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id working-directory: ./dashsync - name: Restore LFS cache - uses: actions/cache@v2 + uses: actions/cache@v3 id: lfs-cache with: path: dashsync/.git/lfs @@ -48,17 +48,26 @@ jobs: - name: Dependencies working-directory: ./dashsync/Example run: pod install --repo-update - - name: Build + - name: Build for testing (without code signing) working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} + scheme: ${{ 'DashSync-Example' }} platform: ${{ 'iOS Simulator' }} run: | - xcodebuild build-for-testing -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" + xcodebuild build-for-testing \ + -scheme "DashSync-Example" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO - name: Test Syncing Chain working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} + scheme: ${{ 'DashSync-Example' }} platform: ${{ 'iOS Simulator' }} run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan TestnetSyncTests + xcodebuild test-without-building \ + -scheme "DashSync-Example" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan TestnetSyncTests \ + CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85707001..205e3595 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,109 +19,192 @@ jobs: - name: Install automake run: | brew install automake + - name: Checkout DashSync - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: dashsync submodules: recursive + - name: Create LFS file list run: | git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id working-directory: ./dashsync + - name: Restore LFS cache uses: actions/cache@v3 id: lfs-cache with: path: dashsync/.git/lfs key: lfs-${{ hashFiles('.lfs-assets-id') }}-v1 + - name: Git LFS Pull run: git lfs pull working-directory: ./dashsync + - uses: actions/cache@v3 with: path: ./dashsync/Example/Pods key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} restore-keys: | ${{ runner.os }}-pods- + - name: Rustup add targets run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim + - name: Dependencies working-directory: ./dashsync/Example run: pod install --repo-update - - name: Build + + - name: Build for testing (with manual code signing) working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild build-for-testing -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" + xcodebuild build-for-testing \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Crypto working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan CryptoTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan CryptoTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Derivations working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan DerivationTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan DerivationTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Libraries working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan LibraryTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan LibraryTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Governance working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan GovernanceTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan GovernanceTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Payments working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan PaymentTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan PaymentTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Masternode Lists working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan MasternodeListTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan MasternodeListTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Wallet working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan WalletTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan WalletTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Platform Transitions working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan PlatformTransitionTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan PlatformTransitionTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Transactions working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan TransactionTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan TransactionTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" + - name: Test Locks working-directory: ./dashsync/Example env: - scheme: ${{ 'default' }} - platform: ${{ 'iOS Simulator' }} + scheme: 'DashSync-Example' + platform: 'iOS Simulator' run: | - xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan LockTests + xcodebuild test-without-building \ + -scheme "$scheme" \ + -workspace "DashSync.xcworkspace" \ + -destination "platform=$platform,name=iPhone 13" \ + -testPlan LockTests \ + CODE_SIGN_STYLE=Manual \ + CODE_SIGN_IDENTITY="Sign to Run Locally" \ No newline at end of file diff --git a/DashSync.podspec b/DashSync.podspec index 98e8e450..f61f85ad 100644 --- a/DashSync.podspec +++ b/DashSync.podspec @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.ios.framework = 'UIKit' s.macos.framework = 'Cocoa' s.compiler_flags = '-Wno-comma' - s.dependency 'DashSharedCore', '0.4.16' + s.dependency 'DashSharedCore', '0.4.18' s.dependency 'CocoaLumberjack', '3.7.2' s.ios.dependency 'DWAlertController', '0.2.1' s.dependency 'DSDynamicOptions', '0.1.2' diff --git a/DashSync/shared/Models/Managers/Chain Managers/DSBackgroundManager.m b/DashSync/shared/Models/Managers/Chain Managers/DSBackgroundManager.m index e579e6a1..a9a9bf89 100644 --- a/DashSync/shared/Models/Managers/Chain Managers/DSBackgroundManager.m +++ b/DashSync/shared/Models/Managers/Chain Managers/DSBackgroundManager.m @@ -86,7 +86,11 @@ - (void)stopBackgroundActivities { } - (BOOL)hasValidHeadersTask { +#if TARGET_OS_IOS return self.terminalHeadersSaveTaskId != UIBackgroundTaskInvalid || [UIApplication sharedApplication].applicationState != UIApplicationStateBackground; +#else + return FALSE; +#endif } @end diff --git a/Example/DashSync.xcodeproj/project.pbxproj b/Example/DashSync.xcodeproj/project.pbxproj index c3888555..53cc4cd0 100644 --- a/Example/DashSync.xcodeproj/project.pbxproj +++ b/Example/DashSync.xcodeproj/project.pbxproj @@ -51,7 +51,7 @@ 2AF8A95622847ACB00F8C72D /* TextViewFormCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF8A95522847ACB00F8C72D /* TextViewFormCellModel.m */; }; 2AF8A95A22847E5300F8C72D /* DSContactProfileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF8A95922847E5200F8C72D /* DSContactProfileViewController.m */; }; 2AF8A95D2284820F00F8C72D /* DSContactProfileAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF8A95C2284820F00F8C72D /* DSContactProfileAvatarView.m */; }; - 404946170FF870F9FBA4B3C7 /* libPods-NetworkInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6675EA01A2AC0589160069A4 /* libPods-NetworkInfo.a */; }; + 4BBAD0ED05B8F29532D1887E /* libPods-NetworkInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FCDB05396B2E9593183904E8 /* libPods-NetworkInfo.a */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; @@ -64,13 +64,14 @@ 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; }; + 65F8D081B17C5F08E6BBF4A8 /* libPods-DashSync-DashSync_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F6B6FEB4981DE6989D82EB0 /* libPods-DashSync-DashSync_Example.a */; }; 71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; }; - 798A60FA627EC43C0AB39611 /* libPods-DashSync-DashSync_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 192956F40996DE819B9D64AC /* libPods-DashSync-DashSync_Example.a */; }; - 83CFCA70892A5DF9F64BA1AA /* libPods-DashSync_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 955D615511918752AF099181 /* libPods-DashSync_Tests.a */; }; 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; }; 93099D7228E7275400160709 /* MNLIST_1746460.dat in Resources */ = {isa = PBXBuildFile; fileRef = 93099D7028E7275300160709 /* MNLIST_1746460.dat */; }; 93099D7328E7275400160709 /* MNL_1746460_1746516.dat in Resources */ = {isa = PBXBuildFile; fileRef = 93099D7128E7275400160709 /* MNL_1746460_1746516.dat */; }; 937619A526E22E360023BE64 /* BackgroundTasks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 937619A326E22DCD0023BE64 /* BackgroundTasks.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + B8D9D66B2CB5A33300D289A9 /* libDashSync-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B8D9D66A2CB5A33300D289A9 /* libDashSync-macOS.a */; }; + D233D44D64AE2AA230F44AA7 /* libPods-DashSync_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE90F593715182564EB9A7E8 /* libPods-DashSync_Tests.a */; }; FB0955CC244BBDC400A93675 /* DSContactRelationshipInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB0955CB244BBDC400A93675 /* DSContactRelationshipInfoViewController.m */; }; FB0F15A2210490C3000272E6 /* DSTransactionDetailTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FB0F15A1210490C3000272E6 /* DSTransactionDetailTableViewCell.m */; }; FB0F15A521049432000272E6 /* DSTransactionStatusTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FB0F15A421049432000272E6 /* DSTransactionStatusTableViewCell.m */; }; @@ -520,8 +521,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 131B02E9F838D9B0B88342E6 /* Pods-NetworkInfo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NetworkInfo.release.xcconfig"; path = "Pods/Target Support Files/Pods-NetworkInfo/Pods-NetworkInfo.release.xcconfig"; sourceTree = ""; }; - 192956F40996DE819B9D64AC /* libPods-DashSync-DashSync_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DashSync-DashSync_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 27552411E6D7D4041AC16526 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; 2A1AC63A20F9012A00B3B79F /* FormSectionModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FormSectionModel.h; sourceTree = ""; }; 2A1AC63B20F9012A00B3B79F /* FormSectionModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FormSectionModel.m; sourceTree = ""; }; @@ -592,8 +591,8 @@ 2AF8A95922847E5200F8C72D /* DSContactProfileViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSContactProfileViewController.m; sourceTree = ""; }; 2AF8A95B2284820F00F8C72D /* DSContactProfileAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSContactProfileAvatarView.h; sourceTree = ""; }; 2AF8A95C2284820F00F8C72D /* DSContactProfileAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSContactProfileAvatarView.m; sourceTree = ""; }; - 2CB0B2B92A8EA70CAE7DC362 /* Pods-DashSync_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-DashSync_Example/Pods-DashSync_Example.release.xcconfig"; sourceTree = ""; }; - 425B12FE369253E7F3A93D58 /* Pods-DashSync-DashSync_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync-DashSync_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example.debug.xcconfig"; sourceTree = ""; }; + 3024E8DE0B1B84642E65E70D /* Pods-DashSync_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync_Tests.debug.xcconfig"; path = "Target Support Files/Pods-DashSync_Tests/Pods-DashSync_Tests.debug.xcconfig"; sourceTree = ""; }; + 37CF4766B1F8739167BAFE02 /* Pods-NetworkInfo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NetworkInfo.debug.xcconfig"; path = "Target Support Files/Pods-NetworkInfo/Pods-NetworkInfo.debug.xcconfig"; sourceTree = ""; }; 6003F58A195388D20070C39A /* DashSync_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DashSync_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -612,19 +611,21 @@ 6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; + 61730B1B3737895F96BE6A54 /* Pods-DashSync-DashSync_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync-DashSync_Example.debug.xcconfig"; path = "Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example.debug.xcconfig"; sourceTree = ""; }; 64A245673BBAE1DA7DAB4907 /* DashSync.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = DashSync.podspec; path = ../DashSync.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 6675EA01A2AC0589160069A4 /* libPods-NetworkInfo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NetworkInfo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6F6B6FEB4981DE6989D82EB0 /* libPods-DashSync-DashSync_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DashSync-DashSync_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 74FDA0D6BCD2D779E20B58FC /* Pods-DashSync-DashSync_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync-DashSync_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example.release.xcconfig"; sourceTree = ""; }; + 77374E9036662C743187A1DA /* Pods-DashSync_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync_Tests.release.xcconfig"; path = "Target Support Files/Pods-DashSync_Tests/Pods-DashSync_Tests.release.xcconfig"; sourceTree = ""; }; 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 93099D7028E7275300160709 /* MNLIST_1746460.dat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MNLIST_1746460.dat; sourceTree = ""; }; 93099D7128E7275400160709 /* MNL_1746460_1746516.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = MNL_1746460_1746516.dat; sourceTree = ""; }; 937619A326E22DCD0023BE64 /* BackgroundTasks.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BackgroundTasks.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/Library/Frameworks/BackgroundTasks.framework; sourceTree = DEVELOPER_DIR; }; - 955D615511918752AF099181 /* libPods-DashSync_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DashSync_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 98472781BAD8800EFF391FA4 /* Pods-DashSync_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DashSync_Example/Pods-DashSync_Example.debug.xcconfig"; sourceTree = ""; }; - C90A9AD2C32828341F0E6915 /* Pods-DashSync_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DashSync_Tests/Pods-DashSync_Tests.debug.xcconfig"; sourceTree = ""; }; - D1B8FECBB1652E781A9E4620 /* Pods-NetworkInfo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NetworkInfo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-NetworkInfo/Pods-NetworkInfo.debug.xcconfig"; sourceTree = ""; }; - DFA886AB709D97089A70E82A /* Pods-DashSync_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-DashSync_Tests/Pods-DashSync_Tests.release.xcconfig"; sourceTree = ""; }; + B8D9D6682CB5A11B00D289A9 /* libDashSync-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libDashSync-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B8D9D66A2CB5A33300D289A9 /* libDashSync-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libDashSync-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B8D9D66C2CB5A36600D289A9 /* DashSharedCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DashSharedCore.xcframework; path = "../../dash-shared-core/dash-spv-apple-bindings/DashSharedCore/framework/DashSharedCore.xcframework"; sourceTree = ""; }; + BD44FCB7175424B2BE7993BB /* Pods-DashSync-DashSync_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DashSync-DashSync_Example.release.xcconfig"; path = "Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example.release.xcconfig"; sourceTree = ""; }; + D97E3B2F9438560328BFE431 /* Pods-NetworkInfo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NetworkInfo.release.xcconfig"; path = "Target Support Files/Pods-NetworkInfo/Pods-NetworkInfo.release.xcconfig"; sourceTree = ""; }; + DE90F593715182564EB9A7E8 /* libPods-DashSync_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DashSync_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E47ABFD6469F1FD556CDA6C7 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; FB0955CA244BBDC400A93675 /* DSContactRelationshipInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSContactRelationshipInfoViewController.h; sourceTree = ""; }; FB0955CB244BBDC400A93675 /* DSContactRelationshipInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSContactRelationshipInfoViewController.m; sourceTree = ""; }; @@ -1190,6 +1191,7 @@ FBF31B6D2231C53900393301 /* DSSignPayloadViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSSignPayloadViewController.h; sourceTree = ""; }; FBF31B6E2231C53900393301 /* DSSignPayloadViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSSignPayloadViewController.m; sourceTree = ""; }; FBF31B7022328AA800393301 /* DSProviderTransactionsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSProviderTransactionsTests.m; sourceTree = ""; }; + FCDB05396B2E9593183904E8 /* libPods-NetworkInfo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NetworkInfo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1200,7 +1202,7 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - 798A60FA627EC43C0AB39611 /* libPods-DashSync-DashSync_Example.a in Frameworks */, + 65F8D081B17C5F08E6BBF4A8 /* libPods-DashSync-DashSync_Example.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1212,7 +1214,7 @@ 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */, 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - 83CFCA70892A5DF9F64BA1AA /* libPods-DashSync_Tests.a in Frameworks */, + D233D44D64AE2AA230F44AA7 /* libPods-DashSync_Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1220,13 +1222,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 404946170FF870F9FBA4B3C7 /* libPods-NetworkInfo.a in Frameworks */, + B8D9D66B2CB5A33300D289A9 /* libDashSync-macOS.a in Frameworks */, + 4BBAD0ED05B8F29532D1887E /* libPods-NetworkInfo.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 15D149D9AD161D779756AC18 /* Pods */ = { + isa = PBXGroup; + children = ( + 61730B1B3737895F96BE6A54 /* Pods-DashSync-DashSync_Example.debug.xcconfig */, + BD44FCB7175424B2BE7993BB /* Pods-DashSync-DashSync_Example.release.xcconfig */, + 3024E8DE0B1B84642E65E70D /* Pods-DashSync_Tests.debug.xcconfig */, + 77374E9036662C743187A1DA /* Pods-DashSync_Tests.release.xcconfig */, + 37CF4766B1F8739167BAFE02 /* Pods-NetworkInfo.debug.xcconfig */, + D97E3B2F9438560328BFE431 /* Pods-NetworkInfo.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 2A1B55BC2226B15A008FED65 /* Contacts */ = { isa = PBXGroup; children = ( @@ -1360,7 +1376,7 @@ FB974F3125AE7A2200A1DCE7 /* CI */, FB974F5025AE8E7000A1DCE7 /* Docs */, FB974F0F25AE595700A1DCE7 /* Linting */, - 83DC6095687FDE098549FF30 /* Pods */, + 15D149D9AD161D779756AC18 /* Pods */, ); sourceTree = ""; }; @@ -1377,14 +1393,17 @@ 6003F58C195388D20070C39A /* Frameworks */ = { isa = PBXGroup; children = ( + B8D9D66C2CB5A36600D289A9 /* DashSharedCore.xcframework */, + B8D9D66A2CB5A33300D289A9 /* libDashSync-macOS.a */, + B8D9D6682CB5A11B00D289A9 /* libDashSync-macOS.a */, 937619A326E22DCD0023BE64 /* BackgroundTasks.framework */, 6003F58D195388D20070C39A /* Foundation.framework */, 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, 6003F5AF195388D20070C39A /* XCTest.framework */, - 955D615511918752AF099181 /* libPods-DashSync_Tests.a */, - 6675EA01A2AC0589160069A4 /* libPods-NetworkInfo.a */, - 192956F40996DE819B9D64AC /* libPods-DashSync-DashSync_Example.a */, + 6F6B6FEB4981DE6989D82EB0 /* libPods-DashSync-DashSync_Example.a */, + DE90F593715182564EB9A7E8 /* libPods-DashSync_Tests.a */, + FCDB05396B2E9593183904E8 /* libPods-NetworkInfo.a */, ); name = Frameworks; sourceTree = ""; @@ -1470,21 +1489,6 @@ name = "Podspec Metadata"; sourceTree = ""; }; - 83DC6095687FDE098549FF30 /* Pods */ = { - isa = PBXGroup; - children = ( - 98472781BAD8800EFF391FA4 /* Pods-DashSync_Example.debug.xcconfig */, - 2CB0B2B92A8EA70CAE7DC362 /* Pods-DashSync_Example.release.xcconfig */, - C90A9AD2C32828341F0E6915 /* Pods-DashSync_Tests.debug.xcconfig */, - DFA886AB709D97089A70E82A /* Pods-DashSync_Tests.release.xcconfig */, - D1B8FECBB1652E781A9E4620 /* Pods-NetworkInfo.debug.xcconfig */, - 131B02E9F838D9B0B88342E6 /* Pods-NetworkInfo.release.xcconfig */, - 425B12FE369253E7F3A93D58 /* Pods-DashSync-DashSync_Example.debug.xcconfig */, - 74FDA0D6BCD2D779E20B58FC /* Pods-DashSync-DashSync_Example.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; FB0F15B421090405000272E6 /* Blockchain Identities */ = { isa = PBXGroup; children = ( @@ -2333,12 +2337,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "DashSync_Example" */; buildPhases = ( - BA464DCB59BC59A2B2C9AAD7 /* [CP] Check Pods Manifest.lock */, + E5F7123626737B797889229A /* [CP] Check Pods Manifest.lock */, FB5A0FA7219506140079CF42 /* ShellScript */, 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - F3524DD5332FD019D466B225 /* [CP] Copy Pods Resources */, + CD1F79E08B3F4F0921F064A8 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2353,7 +2357,7 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "DashSync_Tests" */; buildPhases = ( - 1A450F2773F81BAA9F430A99 /* [CP] Check Pods Manifest.lock */, + D4B84AE4F85D9FB04692A770 /* [CP] Check Pods Manifest.lock */, 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, @@ -2372,11 +2376,11 @@ isa = PBXNativeTarget; buildConfigurationList = FB9C9EFE25B80DB40039880E /* Build configuration list for PBXNativeTarget "NetworkInfo" */; buildPhases = ( - 2B9966A4344269C863326096 /* [CP] Check Pods Manifest.lock */, + 8CDF557444C449CF3402DD40 /* [CP] Check Pods Manifest.lock */, FB9C9EF625B80DB40039880E /* Sources */, FB9C9EF725B80DB40039880E /* Frameworks */, FB9C9EF825B80DB40039880E /* CopyFiles */, - 2B57EF3BDD3D325283813C84 /* [CP] Copy Pods Resources */, + 544387655732F2E6FFDFAD9D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2398,15 +2402,16 @@ ORGANIZATIONNAME = "Dash Core Group"; TargetAttributes = { 6003F589195388D20070C39A = { - DevelopmentTeam = 44RJ69WHFF; + ProvisioningStyle = Manual; }; 6003F5AD195388D20070C39A = { DevelopmentTeam = 44RJ69WHFF; + ProvisioningStyle = Manual; TestTargetID = 6003F589195388D20070C39A; }; FB9C9EF925B80DB40039880E = { CreatedOnToolsVersion = 12.3; - DevelopmentTeam = 44RJ69WHFF; + DevelopmentTeam = VYNC8YJV73; ProvisioningStyle = Automatic; }; }; @@ -2760,25 +2765,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1A450F2773F81BAA9F430A99 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-DashSync_Tests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 2B57EF3BDD3D325283813C84 /* [CP] Copy Pods Resources */ = { + 544387655732F2E6FFDFAD9D /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2800,7 +2787,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NetworkInfo/Pods-NetworkInfo-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 2B9966A4344269C863326096 /* [CP] Check Pods Manifest.lock */ = { + 8CDF557444C449CF3402DD40 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2822,44 +2809,70 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - BA464DCB59BC59A2B2C9AAD7 /* [CP] Check Pods Manifest.lock */ = { + CD1F79E08B3F4F0921F064A8 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/DashSync-iOS/DashSync.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Protobuf-iOS/Protobuf_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/gRPC-iOS/gRPCCertificates.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DashSync.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Protobuf_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + D4B84AE4F85D9FB04692A770 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( "${PODS_PODFILE_DIR_PATH}/Podfile.lock", "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-DashSync-DashSync_Example-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-DashSync_Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F3524DD5332FD019D466B225 /* [CP] Copy Pods Resources */ = { + E5F7123626737B797889229A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/DashSync-iOS/DashSync.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Protobuf-iOS/Protobuf_Privacy.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/gRPC-iOS/gRPCCertificates.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DashSync.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Protobuf_Privacy.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates.bundle", + "$(DERIVED_FILE_DIR)/Pods-DashSync-DashSync_Example-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DashSync-DashSync_Example/Pods-DashSync-DashSync_Example-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; FB5A0FA7219506140079CF42 /* ShellScript */ = { @@ -3219,10 +3232,12 @@ }; 6003F5C0195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 425B12FE369253E7F3A93D58 /* Pods-DashSync-DashSync_Example.debug.xcconfig */; + baseConfigurationReference = 61730B1B3737895F96BE6A54 /* Pods-DashSync-DashSync_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 44RJ69WHFF; + CODE_SIGN_IDENTITY = "Sign to Run Locally"; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "DashSync/DashSync-Prefix.pch"; @@ -3273,16 +3288,18 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; WRAPPER_EXTENSION = app; }; name = Debug; }; 6003F5C1195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 74FDA0D6BCD2D779E20B58FC /* Pods-DashSync-DashSync_Example.release.xcconfig */; + baseConfigurationReference = BD44FCB7175424B2BE7993BB /* Pods-DashSync-DashSync_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 44RJ69WHFF; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "DashSync/DashSync-Prefix.pch"; @@ -3333,16 +3350,19 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; WRAPPER_EXTENSION = app; }; name = Release; }; 6003F5C3195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C90A9AD2C32828341F0E6915 /* Pods-DashSync_Tests.debug.xcconfig */; + baseConfigurationReference = 3024E8DE0B1B84642E65E70D /* Pods-DashSync_Tests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - DEVELOPMENT_TEAM = 44RJ69WHFF; + CODE_SIGN_IDENTITY = "Sign to Run Locally"; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; @@ -3361,7 +3381,7 @@ }; 6003F5C4195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DFA886AB709D97089A70E82A /* Pods-DashSync_Tests.release.xcconfig */; + baseConfigurationReference = 77374E9036662C743187A1DA /* Pods-DashSync_Tests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; DEVELOPMENT_TEAM = 44RJ69WHFF; @@ -3379,7 +3399,7 @@ }; FB9C9EFF25B80DB40039880E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D1B8FECBB1652E781A9E4620 /* Pods-NetworkInfo.debug.xcconfig */; + baseConfigurationReference = 37CF4766B1F8739167BAFE02 /* Pods-NetworkInfo.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3390,13 +3410,53 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 44RJ69WHFF; + DEVELOPMENT_TEAM = VYNC8YJV73; ENABLE_HARDENED_RUNTIME = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu11; MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"BoringSSL-GRPC-macOS\"", + "-l\"CocoaImageHashing-macOS\"", + "-l\"CocoaLumberjack-macOS\"", + "-l\"DAPI-GRPC-macOS\"", + "-l\"DSDynamicOptions-macOS\"", + "-l\"DashSync-macOS\"", + "-l\"Protobuf-macOS\"", + "-l\"SDWebImage-macOS\"", + "-l\"TinyCborObjc-macOS\"", + "-l\"abseil-macOS\"", + "-l\"bz2\"", + "-l\"c++\"", + "-l\"dash_shared_core_macos\"", + "-l\"gRPC-Core-macOS\"", + "-l\"gRPC-ProtoRPC-macOS\"", + "-l\"gRPC-RxLibrary-macOS\"", + "-l\"gRPC-macOS\"", + "-l\"resolv\"", + "-l\"sqlite3\"", + "-l\"tinycbor-macOS\"", + "-l\"z\"", + "-framework", + "\"BackgroundTasks\"", + "-framework", + "\"Cocoa\"", + "-framework", + "\"CoreData\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"ImageIO\"", + "-framework", + "\"Security\"", + "-framework", + "\"SystemConfiguration\"", + "\"-ld_classic\"", + ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; @@ -3405,7 +3465,7 @@ }; FB9C9F0025B80DB40039880E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 131B02E9F838D9B0B88342E6 /* Pods-NetworkInfo.release.xcconfig */; + baseConfigurationReference = D97E3B2F9438560328BFE431 /* Pods-NetworkInfo.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3417,13 +3477,53 @@ CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 44RJ69WHFF; + DEVELOPMENT_TEAM = VYNC8YJV73; ENABLE_HARDENED_RUNTIME = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu11; MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"BoringSSL-GRPC-macOS\"", + "-l\"CocoaImageHashing-macOS\"", + "-l\"CocoaLumberjack-macOS\"", + "-l\"DAPI-GRPC-macOS\"", + "-l\"DSDynamicOptions-macOS\"", + "-l\"DashSync-macOS\"", + "-l\"Protobuf-macOS\"", + "-l\"SDWebImage-macOS\"", + "-l\"TinyCborObjc-macOS\"", + "-l\"abseil-macOS\"", + "-l\"bz2\"", + "-l\"c++\"", + "-l\"dash_shared_core_macos\"", + "-l\"gRPC-Core-macOS\"", + "-l\"gRPC-ProtoRPC-macOS\"", + "-l\"gRPC-RxLibrary-macOS\"", + "-l\"gRPC-macOS\"", + "-l\"resolv\"", + "-l\"sqlite3\"", + "-l\"tinycbor-macOS\"", + "-l\"z\"", + "-framework", + "\"BackgroundTasks\"", + "-framework", + "\"Cocoa\"", + "-framework", + "\"CoreData\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"ImageIO\"", + "-framework", + "\"Security\"", + "-framework", + "\"SystemConfiguration\"", + "\"-ld_classic\"", + ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; diff --git a/Example/Podfile b/Example/Podfile index 85e92f96..91798102 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,6 +1,7 @@ def common_pods # pod 'DashSharedCore', :git => 'https://github.com/dashpay/dash-shared-core.git', :branch => 'fix/core-20-test-additional' -# pod 'DashSharedCore', :git => 'https://github.com/dashpay/dash-shared-core.git', :commit => 'e2dc943' + pod 'DashSharedCore', :git => 'https://github.com/dashpay/dash-shared-core.git', :commit => '7dda9489a1d23221032e2b050c31a317a6e95631' +# pod 'DashSharedCore', :path => '../../dash-shared-core/' pod 'DashSync', :path => '../' pod 'SDWebImage', '5.14.3' pod 'CocoaImageHashing', :git => 'https://github.com/ameingast/cocoaimagehashing.git', :commit => 'ad01eee' @@ -25,17 +26,21 @@ target 'NetworkInfo' do end post_install do |installer| - installer.pods_project.targets.each do |target| - # fixes warnings about unsupported Deployment Target in Xcode 10 - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' - end - # Hide warnings for specific pods - if ["gRPC"].include? target.name - target.build_configurations.each do |config| - config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'YES' - end + installer.pods_project.targets.each do |target| + # fixes warnings about unsupported Deployment Target in Xcode 10 + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end + + # Ensure the GCC_WARN_INHIBIT_ALL_WARNINGS flag is removed for BoringSSL-GRPC and BoringSSL-GRPC-iOS + if ['BoringSSL-GRPC', 'BoringSSL-GRPC-iOS', 'BoringSSL-GRPC-macOS'].include? target.name + target.source_build_phase.files.each do |file| + if file.settings && file.settings['COMPILER_FLAGS'] + flags = file.settings['COMPILER_FLAGS'].split + flags.reject! { |flag| flag == '-GCC_WARN_INHIBIT_ALL_WARNINGS' } + file.settings['COMPILER_FLAGS'] = flags.join(' ') + end end + end end -end - +end \ No newline at end of file diff --git a/Example/Podfile.lock b/Example/Podfile.lock index b0fb2e24..0dd922b4 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -586,11 +586,11 @@ PODS: - "!ProtoCompiler-gRPCPlugin (~> 1.0)" - DAPI-GRPC/Messages - gRPC-ProtoRPC - - DashSharedCore (0.4.16) + - DashSharedCore (0.4.18) - DashSync (0.1.0): - CocoaLumberjack (= 3.7.2) - DAPI-GRPC (= 0.22.0-dev.8) - - DashSharedCore (= 0.4.16) + - DashSharedCore (= 0.4.18) - DSDynamicOptions (= 0.1.2) - DWAlertController (= 0.2.1) - TinyCborObjc (= 0.4.6) @@ -657,7 +657,7 @@ PODS: - gRPC/Interface-Legacy (1.49.0): - gRPC-RxLibrary/Interface (= 1.49.0) - KVO-MVVM (0.5.1) - - Protobuf (3.27.2) + - Protobuf (3.28.2) - SDWebImage (5.14.3): - SDWebImage/Core (= 5.14.3) - SDWebImage/Core (5.14.3) @@ -667,6 +667,7 @@ PODS: DEPENDENCIES: - CocoaImageHashing (from `https://github.com/ameingast/cocoaimagehashing.git`, commit `ad01eee`) + - DashSharedCore (from `https://github.com/dashpay/dash-shared-core.git`, commit `7dda9489a1d23221032e2b050c31a317a6e95631`) - DashSync (from `../`) - KVO-MVVM (= 0.5.1) - SDWebImage (= 5.14.3) @@ -679,7 +680,6 @@ SPEC REPOS: - BoringSSL-GRPC - CocoaLumberjack - DAPI-GRPC - - DashSharedCore - DSDynamicOptions - DWAlertController - gRPC @@ -696,6 +696,9 @@ EXTERNAL SOURCES: CocoaImageHashing: :commit: ad01eee :git: https://github.com/ameingast/cocoaimagehashing.git + DashSharedCore: + :commit: 7dda9489a1d23221032e2b050c31a317a6e95631 + :git: https://github.com/dashpay/dash-shared-core.git DashSync: :path: "../" @@ -703,6 +706,9 @@ CHECKOUT OPTIONS: CocoaImageHashing: :commit: ad01eee :git: https://github.com/ameingast/cocoaimagehashing.git + DashSharedCore: + :commit: 7dda9489a1d23221032e2b050c31a317a6e95631 + :git: https://github.com/dashpay/dash-shared-core.git SPEC CHECKSUMS: "!ProtoCompiler": e9c09244955a8565817aa59a4787b6bb849a63c6 @@ -712,8 +718,8 @@ SPEC CHECKSUMS: CocoaImageHashing: 8656031d0899abe6c1c415827de43e9798189c53 CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da DAPI-GRPC: 138d62523bbfe7e88a39896f1053c0bc12390d9f - DashSharedCore: 81d3327cbea4103114b768eed4d36e742417b63b - DashSync: 5c4dea6e4ef83df33f23f85b7f2b97ef6843de87 + DashSharedCore: 39b477a8cb43f01ffb1a3e18a3ecc0c2bf38481b + DashSync: fea23e18c188a4c79852d1c6816b33a8b9852414 DSDynamicOptions: 347cc5d2c4e080eb3de6a86719ad3d861b82adfc DWAlertController: 5f4cd8adf90336331c054857f709f5f8d4b16a5b gRPC: 64f36d689b2ecd99c4351f74e6f91347cdc65d9f @@ -721,11 +727,11 @@ SPEC CHECKSUMS: gRPC-ProtoRPC: 1c223e0f1732bb8d0b9e9e0ea60cc0fe995b8e2d gRPC-RxLibrary: 92327f150e11cf3b1c0f52e083944fd9f5cb5d1e KVO-MVVM: 4df3afd1f7ebcb69735458b85db59c4271ada7c6 - Protobuf: fb2c13674723f76ff6eede14f78847a776455fa2 + Protobuf: 28c89b24435762f60244e691544ed80f50d82701 SDWebImage: 9c36e66c8ce4620b41a7407698dda44211a96764 tinycbor: d4d71dddda1f8392fbb4249f63faf8552f327590 TinyCborObjc: 5204540fb90ff0c40fb22d408fa51bab79d78a80 -PODFILE CHECKSUM: 8cb419eb95422ed65fbdc41960e405e8cc54dda7 +PODFILE CHECKSUM: 2b3437e89ea617e5578cf4e8071a4bb1cc5edd31 COCOAPODS: 1.15.2