Skip to content

Commit ef8122f

Browse files
author
Netraj Patel
committed
Merge branch 'development' into feat/dx-747
2 parents 4b76a7e + 90961a2 commit ef8122f

5 files changed

Lines changed: 38 additions & 7 deletions

File tree

.github/workflows/release-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build
2525
run: |
2626
# Add commands to build and test your package
27-
xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 13 Pro'
27+
xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 15'
2828
2929
- name: CocoaPods trunk push
3030
run: pod trunk push --allow-warnings

.talismanrc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
fileignoreconfig:
22
- filename: Contentstack.xcodeproj/project.pbxproj
3-
checksum: 331c4ff2e540e9495ff2a0d030ddd7f7c2eda077cb0b1a58c67fc2312b53658e
4-
version: ""
3+
checksum: 10cb4bc5ca755f7392309a88cd6df510a45f8c527ea2f8edc71e1ae1fda60941
4+
- filename: .github/workflows/sast-scan.yml
5+
checksum: 5554abc81d130557f52d64d253c3a23b41fcf0642a9c599131b2c185665ce581
6+
- filename: PrivacyInfo.xcprivacy
7+
checksum: 7697fa6a0a5e0600d35d4678ffff9ef14c5dff5dc1613d37968de7ded3ff1fd0
8+
version: ""

Contentstack.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ s.version = '3.13.0'
44
s.summary = 'Contentstack is a headless CMS with an API-first approach that puts content at the centre.'
55

66
s.description = <<-DESC
7-
Contentstack is a headless CMS with an API-first approach that puts content at the centre. It is designed to simplify the process of publication by separating code from content.
7+
Contentstack is a headless CMS with an API-first approach that puts content at the centre. It is designed to simplify the process of publication by separating code from content.
88
In a world where content is consumed via countless channels and form factors across mobile, web and IoT. Contentstack reimagines content management by decoupling code from content. Business users manage content – no training or development required. Developers can create cross-platform apps and take advantage of a headless CMS that delivers content through APIs. With an architecture that’s extensible – but without the bloat of legacy CMS – Contentstack cuts down on infrastructure, maintenance, cost and complexity.
99
DESC
1010

Contentstack.xcodeproj/project.pbxproj

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
565E11C01BD76654005AD47F /* MMParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B61BD76654005AD47F /* MMParser.m */; };
106106
565E11C11BD76654005AD47F /* MMScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B81BD76654005AD47F /* MMScanner.m */; };
107107
565E11C21BD76654005AD47F /* MMSpanParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11BA1BD76654005AD47F /* MMSpanParser.m */; };
108-
6465B6A32C86F15300127F43 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = 6465B6A22C86F15300127F43 /* config.json */; };
108+
64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 238E841B1B4FE29A00BFDB32 /* libThirdPartyExtension.a */; };
109109
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
110110
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
111111
B07BDA5339BFDDC051785A8F /* libPods-Contentstack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4514C6AB47DF26BA926C681A /* libPods-Contentstack.a */; };
@@ -126,6 +126,20 @@
126126
remoteGlobalIDString = 230B38BF1C16E98B00444A14;
127127
remoteInfo = Contentstack;
128128
};
129+
64B3EA292BF7C4AF009E0F38 /* PBXContainerItemProxy */ = {
130+
isa = PBXContainerItemProxy;
131+
containerPortal = 23A0F84D1B3801D1003334E9 /* Project object */;
132+
proxyType = 1;
133+
remoteGlobalIDString = 238E841A1B4FE29A00BFDB32;
134+
remoteInfo = ThirdPartyExtension;
135+
};
136+
64F522152BF7C31900AE6E0F /* PBXContainerItemProxy */ = {
137+
isa = PBXContainerItemProxy;
138+
containerPortal = 23A0F84D1B3801D1003334E9 /* Project object */;
139+
proxyType = 1;
140+
remoteGlobalIDString = 238E841A1B4FE29A00BFDB32;
141+
remoteInfo = ThirdPartyExtension;
142+
};
129143
/* End PBXContainerItemProxy section */
130144

131145
/* Begin PBXCopyFilesBuildPhase section */
@@ -242,7 +256,8 @@
242256
isa = PBXFrameworksBuildPhase;
243257
buildActionMask = 2147483647;
244258
files = (
245-
B07BDA5339BFDDC051785A8F /* libPods-Contentstack.a in Frameworks */,
259+
64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */,
260+
F08A4E439D49C3F08DD8B39C /* libPods-Contentstack.a in Frameworks */,
246261
);
247262
runOnlyForDeploymentPostprocessing = 0;
248263
};
@@ -544,6 +559,8 @@
544559
);
545560
dependencies = (
546561
230B39171C1709F800444A14 /* PBXTargetDependency */,
562+
64F522162BF7C31900AE6E0F /* PBXTargetDependency */,
563+
64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */,
547564
);
548565
name = Contentstack;
549566
productName = Contentstack;
@@ -827,6 +844,16 @@
827844
target = 230B38BF1C16E98B00444A14 /* Contentstack */;
828845
targetProxy = 23A53F5B1E277CD3001DBE35 /* PBXContainerItemProxy */;
829846
};
847+
64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */ = {
848+
isa = PBXTargetDependency;
849+
target = 238E841A1B4FE29A00BFDB32 /* ThirdPartyExtension */;
850+
targetProxy = 64B3EA292BF7C4AF009E0F38 /* PBXContainerItemProxy */;
851+
};
852+
64F522162BF7C31900AE6E0F /* PBXTargetDependency */ = {
853+
isa = PBXTargetDependency;
854+
target = 238E841A1B4FE29A00BFDB32 /* ThirdPartyExtension */;
855+
targetProxy = 64F522152BF7C31900AE6E0F /* PBXContainerItemProxy */;
856+
};
830857
/* End PBXTargetDependency section */
831858

832859
/* Begin XCBuildConfiguration section */

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ You can use advanced sync queries to fetch custom results while performing initi
300300
301301
### The MIT License (MIT)
302302
303-
Copyright © 2012-2022 [Contentstack](https://www.contentstack.com/). All Rights Reserved
303+
Copyright © 2012-2024 [Contentstack](https://www.contentstack.com/). All Rights Reserved
304304
305305
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
306306

0 commit comments

Comments
 (0)