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

SDK-2182 port layout changes for tuist spm #1349

Merged
merged 27 commits into from
Feb 15, 2024

Conversation

echo-branch
Copy link
Contributor

Reference

SDK-2182
This PR ports over changes that were already released for Tuist SPM on the spm repo. Also includes additional changes to fix integration with cocoapods and carthage.

Summary

Source code layout has been changed to allow non-Xcode SPM to integrate the Branch SDK. This unblocks tuist users.
Updated cocoapods and carthage builds to account for the new layout.

Also includes a bugfix for an earlier unit test changes around BNCURLFilter, this has not shipped yet.

Motivation

Fix compatibility with SPM when not building from within Xcode.

Type Of Change

  • Bug fix (non-breaking change which fixes an issue)

Testing Instructions

Confirm SPM can install and build the Branch SDK.
Confirm Cocoapods can install and build the Branch SDK.
Confirm Carthage can install and build the Branch SDK.
Confirm manually built xcframeworks are valid.
Confirm Branch skiplist version is properly stored.

cc @BranchMetrics/saas-sdk-devs for visibility.

Copy link

codecov bot commented Feb 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (1c4df07) 50.94% compared to head (5ef342a) 51.02%.
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1349      +/-   ##
==========================================
+ Coverage   50.94%   51.02%   +0.07%     
==========================================
  Files          67       66       -1     
  Lines       10130    10143      +13     
  Branches     3798     3722      -76     
==========================================
+ Hits         5161     5175      +14     
+ Misses       4704     4702       -2     
- Partials      265      266       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

# Conflicts:
#	Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj
#	BranchSDK.xcodeproj/project.pbxproj
#	Sources/BranchSDK/BNCLog.m
#	Sources/BranchSDK/BNCServerInterface.m
#	Sources/BranchSDK/Branch.m
#	Sources/BranchSDK/BranchLogger.h
#	Sources/BranchSDK/BranchLogger.m
#	Sources/BranchSDK/Private/BNCLog.h
@echo-branch echo-branch merged commit 346d209 into master Feb 15, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants