Skip to content

Commit 2d2e0b5

Browse files
reeshika-hreeshika-h
committed
Update SDK version to 1.6.3 and add DVR zip such that it doesn't affect spm
1 parent ea3f7ef commit 2d2e0b5

14 files changed

Lines changed: 143 additions & 40 deletions

File tree

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CONTENTSTACK_SDK_VERSION=1.5.1
1+
CONTENTSTACK_SDK_VERSION=1.6.3

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ jobs:
3535
with:
3636
xcode-version: '15.4.0'
3737

38+
- name: Unzip DVR for Testing
39+
run: |
40+
unzip -q Utility/contentstack-swift-dvr.zip -d Utility/
41+
echo "DVR unzipped for testing"
42+
3843
- name: Create config file
3944
run: |
4045
echo '{
@@ -79,6 +84,11 @@ jobs:
7984
with:
8085
xcode-version: '15.4.0'
8186

87+
- name: Unzip DVR for Testing
88+
run: |
89+
unzip -q Utility/contentstack-swift-dvr.zip -d Utility/
90+
echo "DVR unzipped for testing"
91+
8292
- name: Create config file
8393
run: |
8494
echo '{

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,8 @@ TestCase
7676
docs
7777

7878
fastlane/
79-
Gemfile
79+
Gemfile
80+
81+
# Ignore unzipped DVR folder
82+
Utility/contentstack-swift-dvr/
83+
!Utility/contentstack-swift-dvr.zip

‎Cartfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
github "contentstack/contentstack-swift-dvr" "master"
2-
github "contentstack/contentstack-utils-swift"
1+
github "contentstack/contentstack-utils-swift" ~> 1.3.4

‎Cartfile.resolved‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
github "contentstack/contentstack-swift-dvr" "c8040a2451e4bc2c312347531cac6c73f23ce50c"
21
github "contentstack/contentstack-utils-swift" "v1.3.4"

‎Config.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CONTENTSTACK_SDK_VERSION = 1.5.1
1+
CONTENTSTACK_SDK_VERSION = 1.6.3

‎Contentstack iOS Tests.xctestplan‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"configurations" : [
3+
{
4+
"id" : "2A2297B9-D608-493E-86C3-89A25834B643",
5+
"name" : "Test Scheme Action",
6+
"options" : {
7+
8+
}
9+
}
10+
],
11+
"defaultOptions" : {
12+
13+
},
14+
"testTargets" : [
15+
{
16+
"target" : {
17+
"containerPath" : "container:Contentstack.xcodeproj",
18+
"identifier" : "0F4A75D2241BAC4300E3A024",
19+
"name" : "Contentstack iOS Tests"
20+
}
21+
}
22+
],
23+
"version" : 1
24+
}

‎Contentstack.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@
15411541
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
15421542
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15431543
CODE_SIGN_STYLE = Automatic;
1544-
DEVELOPMENT_TEAM = SMAKUMV86W;
1544+
DEVELOPMENT_TEAM = FLVTD4X723;
15451545
ENABLE_STRICT_OBJC_MSGSEND = YES;
15461546
ENABLE_TESTABILITY = YES;
15471547
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1611,7 +1611,7 @@
16111611
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
16121612
CODE_SIGN_STYLE = Automatic;
16131613
COPY_PHASE_STRIP = NO;
1614-
DEVELOPMENT_TEAM = SMAKUMV86W;
1614+
DEVELOPMENT_TEAM = FLVTD4X723;
16151615
ENABLE_NS_ASSERTIONS = NO;
16161616
ENABLE_STRICT_OBJC_MSGSEND = YES;
16171617
ENABLE_TESTABILITY = YES;
@@ -2588,14 +2588,6 @@
25882588
kind = branch;
25892589
};
25902590
};
2591-
47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */ = {
2592-
isa = XCRemoteSwiftPackageReference;
2593-
repositoryURL = "https://github.com/contentstack/contentstack-swift-dvr.git";
2594-
requirement = {
2595-
branch = master;
2596-
kind = branch;
2597-
};
2598-
};
25992591
/* End XCRemoteSwiftPackageReference section */
26002592

26012593
/* Begin XCSwiftPackageProductDependency section */

‎Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS.xcscheme‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1620"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "0F4A75CA241BAC4300E3A024"
19+
BuildableName = "Contentstack.framework"
20+
BlueprintName = "Contentstack iOS"
21+
ReferencedContainer = "container:Contentstack.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "0F4A75CA241BAC4300E3A024"
54+
BuildableName = "Contentstack.framework"
55+
BlueprintName = "Contentstack iOS"
56+
ReferencedContainer = "container:Contentstack.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎ContentstackSwift.podspec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ Pod::Spec.new do |s|
3131
}
3232
s.source = { :git => 'https://github.com/contentstack/contentstack-swift.git', :tag => s.version.to_s }
3333
s.social_media_url = 'https://twitter.com/Contentstack'
34-
s.swift_version = '5'
34+
s.swift_version = '5.6'
3535

36-
s.ios.deployment_target = '11.0'
37-
s.osx.deployment_target = '10.13'
38-
s.watchos.deployment_target = '4.0'
39-
s.tvos.deployment_target = '11.0'
36+
s.ios.deployment_target = '13.0'
37+
s.osx.deployment_target = '10.15'
38+
s.watchos.deployment_target = '6.0'
39+
s.tvos.deployment_target = '13.0'
4040

4141

4242
s.source_files = 'Sources/**/*'
4343

4444
# s.public_header_files = 'Pod/Classes/**/*.h'
4545
# s.frameworks = 'UIKit'
46-
s.dependency 'ContentstackUtils', '~> 1.3.0'
46+
s.dependency 'ContentstackUtils', '~> 1.3.4'
4747
end
4848

0 commit comments

Comments
 (0)