Skip to content

Commit 1563c50

Browse files
uttamukkojiuttamukkoji
authored
Merge pull request #12 from contentstack/embedded_items
Embedded items
2 parents b3ffc36 + 6c23290 commit 1563c50

File tree

8 files changed

+47
-14
lines changed

8 files changed

+47
-14
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
### Version: 3.9.0
2+
#### Date: Apr-05-2021
3+
4+
##### New Feature:
5+
- Entry
6+
- 'includeEmbeddedItems' function added
7+
- Query
8+
- 'includeEmbeddedItems' function added
9+
110
### Version: 3.8.2
211
#### Date: Mar-05-2021
312

‎Contentstack.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Contentstack'
3-
s.version = '3.8.2'
3+
s.version = '3.9.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
@@ -12,7 +12,7 @@ s.homepage = 'https://www.contentstack.com/'
1212
s.license = { :type => 'Commercial',:text => 'See https://www.contentstack.com/'}
1313
s.author = { 'Contentstack' => 'support@contentstack.io' }
1414

15-
s.source = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.8.2' }
15+
s.source = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.9.0' }
1616
s.social_media_url = 'https://twitter.com/Contentstack'
1717

1818
s.ios.deployment_target = '8.0'

‎Contentstack.xcodeproj/project.pbxproj

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@
102102
565E11C01BD76654005AD47F /* MMParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B61BD76654005AD47F /* MMParser.m */; };
103103
565E11C11BD76654005AD47F /* MMScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B81BD76654005AD47F /* MMScanner.m */; };
104104
565E11C21BD76654005AD47F /* MMSpanParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11BA1BD76654005AD47F /* MMSpanParser.m */; };
105-
CBB348418CAB6166E8BFA905 /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 41C23F0FF586499A39EC071B /* libPods-ContentstackTest.a */; };
105+
A8578B5A5FC7CFB43A6A0974 /* Pods_ContentstackTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98FF6AF1D92A316A651828C0 /* Pods_ContentstackTest.framework */; };
106+
B8D2E054C6CADDD2B3DC2461 /* Pods_Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 666E9A1F9679B18D11D49C76 /* Pods_Contentstack.framework */; };
106107
/* End PBXBuildFile section */
107108

108109
/* Begin PBXContainerItemProxy section */
@@ -201,7 +202,6 @@
201202
23B6F1281B5662EE00A9E983 /* ISO8601DateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ISO8601DateFormatter.m; sourceTree = "<group>"; };
202203
23C545FB1C1976FE007BBD27 /* ios-build-framework-script.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "ios-build-framework-script.sh"; sourceTree = "<group>"; };
203204
3CF581B9F7526EDA48ED5C6F /* Pods-ContentstackTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ContentstackTest.debug.xcconfig"; path = "Target Support Files/Pods-ContentstackTest/Pods-ContentstackTest.debug.xcconfig"; sourceTree = "<group>"; };
204-
41C23F0FF586499A39EC071B /* libPods-ContentstackTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ContentstackTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
205205
565E11A91BD76654005AD47F /* MMDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDocument.h; sourceTree = "<group>"; };
206206
565E11AA1BD76654005AD47F /* MMDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMDocument.m; sourceTree = "<group>"; };
207207
565E11AB1BD76654005AD47F /* MMDocument_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDocument_Private.h; sourceTree = "<group>"; };
@@ -220,8 +220,10 @@
220220
565E11B81BD76654005AD47F /* MMScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMScanner.m; sourceTree = "<group>"; };
221221
565E11B91BD76654005AD47F /* MMSpanParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMSpanParser.h; sourceTree = "<group>"; };
222222
565E11BA1BD76654005AD47F /* MMSpanParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMSpanParser.m; sourceTree = "<group>"; };
223+
666E9A1F9679B18D11D49C76 /* Pods_Contentstack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Contentstack.framework; sourceTree = BUILT_PRODUCTS_DIR; };
223224
852617AD67506289EC376E26 /* Pods-ContentstackTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ContentstackTest.release.xcconfig"; path = "Target Support Files/Pods-ContentstackTest/Pods-ContentstackTest.release.xcconfig"; sourceTree = "<group>"; };
224225
8A0C6846766D60DA3F50E989 /* Pods-Contentstack.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Contentstack.release.xcconfig"; path = "Target Support Files/Pods-Contentstack/Pods-Contentstack.release.xcconfig"; sourceTree = "<group>"; };
226+
98FF6AF1D92A316A651828C0 /* Pods_ContentstackTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ContentstackTest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
225227
9980728A1E1BDC5000524FD3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
226228
D36158266EF475AC2496807A /* libPods-Contentstack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Contentstack.a"; sourceTree = BUILT_PRODUCTS_DIR; };
227229
F32D688A33248F4030DC4D01 /* libPods-ThirdPartyExtension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ThirdPartyExtension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -233,6 +235,7 @@
233235
isa = PBXFrameworksBuildPhase;
234236
buildActionMask = 2147483647;
235237
files = (
238+
B8D2E054C6CADDD2B3DC2461 /* Pods_Contentstack.framework in Frameworks */,
236239
);
237240
runOnlyForDeploymentPostprocessing = 0;
238241
};
@@ -252,7 +255,7 @@
252255
buildActionMask = 2147483647;
253256
files = (
254257
23A53F5A1E277CD3001DBE35 /* Contentstack.framework in Frameworks */,
255-
CBB348418CAB6166E8BFA905 /* libPods-ContentstackTest.a in Frameworks */,
258+
A8578B5A5FC7CFB43A6A0974 /* Pods_ContentstackTest.framework in Frameworks */,
256259
);
257260
runOnlyForDeploymentPostprocessing = 0;
258261
};
@@ -471,7 +474,8 @@
471474
0FDC02D1254A9CFA005EDDE3 /* libContentstackUtils.a */,
472475
D36158266EF475AC2496807A /* libPods-Contentstack.a */,
473476
F32D688A33248F4030DC4D01 /* libPods-ThirdPartyExtension.a */,
474-
41C23F0FF586499A39EC071B /* libPods-ContentstackTest.a */,
477+
666E9A1F9679B18D11D49C76 /* Pods_Contentstack.framework */,
478+
98FF6AF1D92A316A651828C0 /* Pods_ContentstackTest.framework */,
475479
);
476480
name = Frameworks;
477481
sourceTree = "<group>";
@@ -561,6 +565,7 @@
561565
23A53F511E277CD3001DBE35 /* Sources */,
562566
23A53F521E277CD3001DBE35 /* Frameworks */,
563567
23A53F531E277CD3001DBE35 /* Resources */,
568+
72912E670CB1905672FFCC91 /* [CP] Embed Pods Frameworks */,
564569
);
565570
buildRules = (
566571
);
@@ -700,6 +705,24 @@
700705
shellPath = /bin/sh;
701706
shellScript = "${PROJECT_DIR}/Script/ios-build-framework-script.sh\n";
702707
};
708+
72912E670CB1905672FFCC91 /* [CP] Embed Pods Frameworks */ = {
709+
isa = PBXShellScriptBuildPhase;
710+
buildActionMask = 2147483647;
711+
files = (
712+
);
713+
inputPaths = (
714+
"${PODS_ROOT}/Target Support Files/Pods-ContentstackTest/Pods-ContentstackTest-frameworks.sh",
715+
"${BUILT_PRODUCTS_DIR}/ContentstackUtils/ContentstackUtils.framework",
716+
);
717+
name = "[CP] Embed Pods Frameworks";
718+
outputPaths = (
719+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ContentstackUtils.framework",
720+
);
721+
runOnlyForDeploymentPostprocessing = 0;
722+
shellPath = /bin/sh;
723+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ContentstackTest/Pods-ContentstackTest-frameworks.sh\"\n";
724+
showEnvVarsInLog = 0;
725+
};
703726
F8017163DC4800D53D3ACF35 /* [CP] Check Pods Manifest.lock */ = {
704727
isa = PBXShellScriptBuildPhase;
705728
buildActionMask = 2147483647;
@@ -832,7 +855,7 @@
832855
GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
833856
INFOPLIST_FILE = Contentstack/Info.plist;
834857
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
835-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
858+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
836859
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
837860
MACH_O_TYPE = staticlib;
838861
ONLY_ACTIVE_ARCH = YES;
@@ -861,7 +884,7 @@
861884
GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
862885
INFOPLIST_FILE = Contentstack/Info.plist;
863886
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
864-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
887+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
865888
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
866889
MACH_O_TYPE = staticlib;
867890
OTHER_CFLAGS = "";
@@ -942,7 +965,7 @@
942965
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
943966
GCC_WARN_UNUSED_FUNCTION = YES;
944967
GCC_WARN_UNUSED_VARIABLE = YES;
945-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
968+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
946969
MTL_ENABLE_DEBUG_INFO = YES;
947970
ONLY_ACTIVE_ARCH = NO;
948971
OTHER_CFLAGS = "-fembed-bitcode-marker";
@@ -991,7 +1014,7 @@
9911014
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
9921015
GCC_WARN_UNUSED_FUNCTION = YES;
9931016
GCC_WARN_UNUSED_VARIABLE = YES;
994-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1017+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
9951018
MTL_ENABLE_DEBUG_INFO = NO;
9961019
ONLY_ACTIVE_ARCH = NO;
9971020
OTHER_CFLAGS = "-fembed-bitcode";

‎ContentstackInternal/CSIOConstants.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ FOUNDATION_EXPORT NSString *const kCSIO_IncludeRefContentTypeUID;
6060
FOUNDATION_EXPORT NSString *const kCSIO_IncludeCount;
6161
FOUNDATION_EXPORT NSString *const kCSIO_IncludeUnpublished;
6262
FOUNDATION_EXPORT NSString *const kCSIO_IncludeFallback;
63+
FOUNDATION_EXPORT NSString *const kCSIO_IncludeEmbeddedItems;
6364
FOUNDATION_EXPORT NSString *const kCSIO_BeforeUID;
6465
FOUNDATION_EXPORT NSString *const kCSIO_AfterUID;
6566
FOUNDATION_EXPORT NSString *const kCSIO_Limit;

‎ContentstackInternal/CSIOConstants.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ @implementation CSIOConstants
6464
NSString *const kCSIO_IncludeCount = @"include_count";
6565
NSString *const kCSIO_IncludeUnpublished = @"include_unpublished";
6666
NSString *const kCSIO_IncludeFallback = @"include_fallback";
67+
NSString *const kCSIO_IncludeEmbeddedItems = @"include_embedded_items";
68+
6769
//
6870
NSString *const kCSIO_BeforeUID = @"before_uid";
6971
NSString *const kCSIO_AfterUID = @"after_uid";

‎ContentstackInternal/CSIOCoreHTTPNetworking.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#import "NSObject+Extensions.h"
1616
#import "CSURLSessionManager.h"
1717

18-
NSString *const sdkVersion = @"3.8.2";
18+
NSString *const sdkVersion = @"3.9.0";
1919

2020
@interface CSIOCoreHTTPNetworking (){
2121
id networkChangeObserver;

‎Docs/DocGenerationScript.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ target="iphoneos";
2525
/usr/local/bin/appledoc \
2626
--project-name "Contentstack" \
2727
--project-company "Contentstack.com" \
28-
--project-version "3.8.2" \
28+
--project-version "3.9.0" \
2929
--company-id "${companyID}" \
3030
--docset-bundle-id "${companyID}.${companyForFeed}" \
3131
--docset-bundle-name "${companyForFeed}" \

‎Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
target 'Contentstack' do
55
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
66
# use_frameworks!
7-
87
# Pods for Contentstack
98
end
109
target 'ContentstackTest' do
1110
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
1211
# use_frameworks!
13-
1412
# Pods for Contentstack
1513
end

0 commit comments

Comments
 (0)