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

IOS-5453: Add SPM support #333

Merged
merged 20 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7763841
IOS-5453: Update ruby deps and fix their versions
m3g0byt3 Dec 17, 2023
0f57689
IOS-5453: Update project using Xcode 15.1.0
m3g0byt3 Dec 18, 2023
dd8e7d7
IOS-5453: Bring back iOS 11.0 as a minimum deployment target
m3g0byt3 Dec 18, 2023
818ed79
IOS-5453: Clean-up podspec file a bit
m3g0byt3 Dec 18, 2023
bdf9e6b
IOS-5453: Add refs to gemfiles and podfiles
m3g0byt3 Dec 18, 2023
d5a7874
IOS-5453: Fix compilation error due to script sandboxing
m3g0byt3 Dec 24, 2023
d31fc7f
IOS-5453: Fix C flags
m3g0byt3 Dec 24, 2023
1931371
IOS-5453: Update example project
m3g0byt3 Dec 24, 2023
4a87c4b
IOS-5453: Fix project file inconsistency
m3g0byt3 Dec 24, 2023
7364788
IOS-5453: Remove unused codegen-related C file
m3g0byt3 Dec 24, 2023
0150cf7
IOS-5453: Fix compilation errors due to transitive imports
m3g0byt3 Dec 24, 2023
8059190
IOS-5453: Add package manifest
m3g0byt3 Dec 24, 2023
2027d35
IOS-5453: Fix bundle resources in unit tests when SPM is used
m3g0byt3 Dec 24, 2023
935d62c
IOS-5453: Fix bundle resources in the main target
m3g0byt3 Dec 24, 2023
6cb5c5e
IOS-5453: Fix example project file inconsistency
m3g0byt3 Dec 24, 2023
4a69428
IOS-5453: Improve file path for localization resources
m3g0byt3 Dec 24, 2023
669291b
IOS-5453: Update example project
m3g0byt3 Dec 24, 2023
fb0d4be
IOS-5453: Fix compilation error
m3g0byt3 Dec 24, 2023
fdbe938
IOS-5453: Fix some typos and warnings
m3g0byt3 Dec 24, 2023
b65de7a
Merge branch 'develop' into feature/IOS-5453-add-spm-support
m3g0byt3 Dec 26, 2023
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
3 changes: 3 additions & 0 deletions Example/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "https://rubygems.org"

gem "cocoapods", "~> 1.14.0"
107 changes: 107 additions & 0 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
rexml
activesupport (7.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
bigdecimal (3.1.5)
claide (1.1.0)
cocoapods (1.14.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.20.0)
molinillo (0.8.0)
mutex_m (0.2.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.7)
rexml (3.2.6)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.23.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)

PLATFORMS
arm64-darwin-21

DEPENDENCIES
cocoapods (~> 1.14.0)

BUNDLED WITH
2.4.22
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
TangemSdk: f3adf8d0c18bf7a76406462fa31c0efa9f2efa93
TangemSdk: 61e07ff112d4095cfa688fa7d4694e59fa29f76d

PODFILE CHECKSUM: fb4745483d8583db4c8ae8aa3ccbde86ca112a6b

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
35 changes: 23 additions & 12 deletions Example/TangemSdkExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -41,6 +41,8 @@
5DDCEC7A25C958220002090D /* UI+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DDCEC7425C957930002090D /* UI+.swift */; };
B00A67B3253D8CAC002D7D53 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B00A67B2253D8CAC002D7D53 /* Utils.swift */; };
B00A67B6253D8DA2002D7D53 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B00A67B2253D8CAC002D7D53 /* Utils.swift */; };
B6B9589C2B2FCA9900E7B74E /* Gemfile in Resources */ = {isa = PBXBuildFile; fileRef = B6B9589A2B2FCA9900E7B74E /* Gemfile */; };
B6B9589D2B2FCA9900E7B74E /* Podfile in Resources */ = {isa = PBXBuildFile; fileRef = B6B9589B2B2FCA9900E7B74E /* Podfile */; };
DC23ED9F2912DD0D0023E626 /* ResetToFactorySettingsTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC23ED9E2912DD0D0023E626 /* ResetToFactorySettingsTask.swift */; };
DC23EDA02912DD520023E626 /* ResetToFactorySettingsTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC23ED9E2912DD0D0023E626 /* ResetToFactorySettingsTask.swift */; };
DC28E0F22877F84B00AE7A84 /* DebugLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC28E0F12877F84B00AE7A84 /* DebugLogger.swift */; };
Expand Down Expand Up @@ -93,6 +95,8 @@
5E2717BD1D7CB2EFFB59D0F4 /* Pods-TangemSdkExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TangemSdkExample.release.xcconfig"; path = "Target Support Files/Pods-TangemSdkExample/Pods-TangemSdkExample.release.xcconfig"; sourceTree = "<group>"; };
ABA3866CD02DAF9913B7E6BD /* Pods-TangemSdkExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TangemSdkExample.debug.xcconfig"; path = "Target Support Files/Pods-TangemSdkExample/Pods-TangemSdkExample.debug.xcconfig"; sourceTree = "<group>"; };
B00A67B2253D8CAC002D7D53 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
B6B9589A2B2FCA9900E7B74E /* Gemfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Gemfile; sourceTree = "<group>"; };
B6B9589B2B2FCA9900E7B74E /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
DC23ED9E2912DD0D0023E626 /* ResetToFactorySettingsTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetToFactorySettingsTask.swift; sourceTree = "<group>"; };
DC28E0F12877F84B00AE7A84 /* DebugLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugLogger.swift; sourceTree = "<group>"; };
E53EB3E423F2C7C90079CC11 /* TangemSdkExampleDevelopmentUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TangemSdkExampleDevelopmentUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -135,10 +139,10 @@
5D032008266A8523008472EC /* ExampleButton.swift */,
5DDCEC7425C957930002090D /* UI+.swift */,
B00A67B2253D8CAC002D7D53 /* Utils.swift */,
5D78C1C4234F435C008D7478 /* LaunchScreen.storyboard */,
5D78C1C2234F435C008D7478 /* Assets.xcassets */,
5D78C1B9234F435B008D7478 /* AppDelegate.swift */,
5D03200D266A85CB008472EC /* ActivityIndicatorView.swift */,
5D78C1C4234F435C008D7478 /* LaunchScreen.storyboard */,
5D78C1C2234F435C008D7478 /* Assets.xcassets */,
);
path = Common;
sourceTree = "<group>";
Expand All @@ -158,6 +162,8 @@
5D78C1AD234F435B008D7478 = {
isa = PBXGroup;
children = (
B6B9589A2B2FCA9900E7B74E /* Gemfile */,
B6B9589B2B2FCA9900E7B74E /* Podfile */,
5D78C1B8234F435B008D7478 /* TangemSdkExample */,
E53EB3E523F2C7C90079CC11 /* TangemSdkExampleDevelopmentUITests */,
5D78C1B7234F435B008D7478 /* Products */,
Expand All @@ -179,12 +185,12 @@
5D78C1B8234F435B008D7478 /* TangemSdkExample */ = {
isa = PBXGroup;
children = (
5D03200C266A8548008472EC /* Common */,
5D2BDF7E26DCE000002F7E19 /* Developer */,
5D032000266A6A15008472EC /* AppModel.swift */,
5D031FFC266A6960008472EC /* ContentView.swift */,
5D03200C266A8548008472EC /* Common */,
5D7FE136234F7D6700A1F440 /* TangemSdkExample.entitlements */,
5D1C6C7127214EA900E04A8B /* SettingsView.swift */,
5D7FE136234F7D6700A1F440 /* TangemSdkExample.entitlements */,
);
path = TangemSdkExample;
sourceTree = "<group>";
Expand Down Expand Up @@ -281,8 +287,9 @@
5D78C1AE234F435B008D7478 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1120;
LastUpgradeCheck = 1250;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "Tangem AG";
TargetAttributes = {
5D78C1B5234F435B008D7478 = {
Expand All @@ -294,7 +301,7 @@
};
};
};
buildConfigurationList = 5D78C1B1234F435B008D7478 /* Build configuration list for PBXProject "TangemSDKExample" */;
buildConfigurationList = 5D78C1B1234F435B008D7478 /* Build configuration list for PBXProject "TangemSdkExample" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand All @@ -319,7 +326,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B6B9589C2B2FCA9900E7B74E /* Gemfile in Resources */,
5D78C1C6234F435C008D7478 /* LaunchScreen.storyboard in Resources */,
B6B9589D2B2FCA9900E7B74E /* Podfile in Resources */,
5D78C1C3234F435C008D7478 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -492,6 +501,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -553,6 +563,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down Expand Up @@ -587,7 +598,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.tangem.TangemSDKExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_INCLUDE_PATHS = "$(inherited) /Users/alexander.osokin/repos/tangem/tangem-ios/TangemSdk/TangemSdk/TangemSdk/Crypto/Ed25519/CEd25519";
SWIFT_INCLUDE_PATHS = "$(inherited)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -609,7 +620,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.tangem.TangemSDKExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_INCLUDE_PATHS = "$(inherited) /Users/alexander.osokin/repos/tangem/tangem-ios/TangemSdk/TangemSdk/TangemSdk/Crypto/Ed25519/CEd25519";
SWIFT_INCLUDE_PATHS = "$(inherited)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -623,7 +634,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = "TangemSdkExample copy-Info.plist";
INFOPLIST_FILE = "TangemSdkExample/Info-Development.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -643,7 +654,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = "TangemSdkExample copy-Info.plist";
INFOPLIST_FILE = "TangemSdkExample/Info-Development.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -698,7 +709,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
5D78C1B1234F435B008D7478 /* Build configuration list for PBXProject "TangemSDKExample" */ = {
5D78C1B1234F435B008D7478 /* Build configuration list for PBXProject "TangemSdkExample" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5D78C1C8234F435C008D7478 /* Debug */,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -17,7 +17,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -47,7 +47,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -64,7 +64,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "https://rubygems.org"

gem "fastlane"
gem "cocoapods"
gem "fastlane", "~> 2.217.0"
gem "cocoapods", "~> 1.14.0"
Loading
Loading