Skip to content

Commit 52f40ad

Browse files
uttamukkojiuttamukkoji
authored
Merge pull request #9 from contentstack/publish_fallback
Publish Content Fallback
2 parents e8c59bb + 6204298 commit 52f40ad

File tree

5 files changed

+40
-11
lines changed

5 files changed

+40
-11
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2+
### Version: 3.8.0
3+
#### Date: Dec-05-2020
4+
5+
##### Update API:
6+
- Asset
7+
- 'includeFallback' function added
8+
- AssetLibrary
9+
- 'includeFallback' function added
10+
- Entry
11+
- 'includeFallback' function added
12+
- Query
13+
- 'includeFallback' function added
14+
115
### Version: 3.7.1
216
#### Date: Nov-15-2019
317
- EU

‎Contentstack.xcodeproj/project.pbxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24-
0F1F2145225B844F00358EB0 /* libPods-Contentstack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F1F2144225B844F00358EB0 /* libPods-Contentstack.a */; };
24+
0F4D7E57D696BA541291C60B /* libPods-Contentstack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D36158266EF475AC2496807A /* libPods-Contentstack.a */; };
2525
0F9C0FB1221ADAC90091205A /* AssetLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F9C0F98221ADAC70091205A /* AssetLibrary.h */; settings = {ATTRIBUTES = (Public, ); }; };
2626
0F9C0FB2221ADAC90091205A /* AssetLibrary.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F9C0F99221ADAC70091205A /* AssetLibrary.m */; };
2727
0F9C0FB3221ADAC90091205A /* Group.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F9C0F9A221ADAC70091205A /* Group.m */; };
@@ -93,7 +93,6 @@
9393
23A53F581E277CD3001DBE35 /* ContentstackTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A53F571E277CD3001DBE35 /* ContentstackTest.m */; };
9494
23A53F5A1E277CD3001DBE35 /* Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 230B38C01C16E98B00444A14 /* Contentstack.framework */; };
9595
23B6F12A1B5662EE00A9E983 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B6F1281B5662EE00A9E983 /* ISO8601DateFormatter.m */; };
96-
34018E4F8BA11F506C47F660 /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 507E69E336F90FEB009579FC /* libPods-ContentstackTest.a */; };
9796
565E11BB1BD76654005AD47F /* MMDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AA1BD76654005AD47F /* MMDocument.m */; };
9897
565E11BC1BD76654005AD47F /* MMElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AD1BD76654005AD47F /* MMElement.m */; };
9998
565E11BD1BD76654005AD47F /* MMGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AF1BD76654005AD47F /* MMGenerator.m */; };
@@ -102,6 +101,7 @@
102101
565E11C01BD76654005AD47F /* MMParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B61BD76654005AD47F /* MMParser.m */; };
103102
565E11C11BD76654005AD47F /* MMScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B81BD76654005AD47F /* MMScanner.m */; };
104103
565E11C21BD76654005AD47F /* MMSpanParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11BA1BD76654005AD47F /* MMSpanParser.m */; };
104+
CBB348418CAB6166E8BFA905 /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 41C23F0FF586499A39EC071B /* libPods-ContentstackTest.a */; };
105105
FA36C00820ECABDF000FF701 /* SyncTest.m in Sources */ = {isa = PBXBuildFile; fileRef = FA36C00720ECABDF000FF701 /* SyncTest.m */; };
106106
/* End PBXBuildFile section */
107107

@@ -136,8 +136,6 @@
136136

137137
/* Begin PBXFileReference section */
138138
0F0A70AD225DEDDF00E0284F /* Contentstack.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Contentstack.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
139-
0F1F2142225B6F7800358EB0 /* libPods-Contentstack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libPods-Contentstack.a"; sourceTree = BUILT_PRODUCTS_DIR; };
140-
0F1F2144225B844F00358EB0 /* libPods-Contentstack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libPods-Contentstack.a"; sourceTree = BUILT_PRODUCTS_DIR; };
141139
0F6C89AC225CCE9F004C342A /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
142140
0F9C0F98221ADAC70091205A /* AssetLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetLibrary.h; sourceTree = "<group>"; };
143141
0F9C0F99221ADAC70091205A /* AssetLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssetLibrary.m; sourceTree = "<group>"; };
@@ -163,6 +161,7 @@
163161
0F9C0FAD221ADAC90091205A /* SyncStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyncStack.h; sourceTree = "<group>"; };
164162
0F9C0FAE221ADAC90091205A /* Entry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Entry.h; sourceTree = "<group>"; };
165163
0F9C0FB0221ADAC90091205A /* NamespacedDependencies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamespacedDependencies.h; sourceTree = "<group>"; };
164+
0FDC02D1254A9CFA005EDDE3 /* libContentstackUtils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libContentstackUtils.a; sourceTree = BUILT_PRODUCTS_DIR; };
166165
0FEAEF232361A18600985FF9 /* CSNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSNetworking.h; sourceTree = "<group>"; };
167166
0FEAEF242361A18600985FF9 /* CSError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSError.h; sourceTree = "<group>"; };
168167
0FEAEF252361A18600985FF9 /* CSURLSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSURLSessionManager.m; sourceTree = "<group>"; };
@@ -200,7 +199,7 @@
200199
23B6F1281B5662EE00A9E983 /* ISO8601DateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ISO8601DateFormatter.m; sourceTree = "<group>"; };
201200
23C545FB1C1976FE007BBD27 /* ios-build-framework-script.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "ios-build-framework-script.sh"; sourceTree = "<group>"; };
202201
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>"; };
203-
507E69E336F90FEB009579FC /* libPods-ContentstackTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ContentstackTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
202+
41C23F0FF586499A39EC071B /* libPods-ContentstackTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ContentstackTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
204203
565E11A91BD76654005AD47F /* MMDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDocument.h; sourceTree = "<group>"; };
205204
565E11AA1BD76654005AD47F /* MMDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMDocument.m; sourceTree = "<group>"; };
206205
565E11AB1BD76654005AD47F /* MMDocument_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDocument_Private.h; sourceTree = "<group>"; };
@@ -233,7 +232,7 @@
233232
isa = PBXFrameworksBuildPhase;
234233
buildActionMask = 2147483647;
235234
files = (
236-
0F1F2145225B844F00358EB0 /* libPods-Contentstack.a in Frameworks */,
235+
0F4D7E57D696BA541291C60B /* libPods-Contentstack.a in Frameworks */,
237236
);
238237
runOnlyForDeploymentPostprocessing = 0;
239238
};
@@ -253,7 +252,7 @@
253252
buildActionMask = 2147483647;
254253
files = (
255254
23A53F5A1E277CD3001DBE35 /* Contentstack.framework in Frameworks */,
256-
34018E4F8BA11F506C47F660 /* libPods-ContentstackTest.a in Frameworks */,
255+
CBB348418CAB6166E8BFA905 /* libPods-ContentstackTest.a in Frameworks */,
257256
);
258257
runOnlyForDeploymentPostprocessing = 0;
259258
};
@@ -468,11 +467,10 @@
468467
7A43BE06DFBC17BDC981A673 /* Frameworks */ = {
469468
isa = PBXGroup;
470469
children = (
471-
0F1F2144225B844F00358EB0 /* libPods-Contentstack.a */,
472-
0F1F2142225B6F7800358EB0 /* libPods-Contentstack.a */,
470+
0FDC02D1254A9CFA005EDDE3 /* libContentstackUtils.a */,
473471
D36158266EF475AC2496807A /* libPods-Contentstack.a */,
474-
507E69E336F90FEB009579FC /* libPods-ContentstackTest.a */,
475472
F32D688A33248F4030DC4D01 /* libPods-ThirdPartyExtension.a */,
473+
41C23F0FF586499A39EC071B /* libPods-ContentstackTest.a */,
476474
);
477475
name = Frameworks;
478476
sourceTree = "<group>";

‎ContentstackInternal/CSIOConstants.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ FOUNDATION_EXPORT NSString *const kCSIO_IncludeContentType;
5959
FOUNDATION_EXPORT NSString *const kCSIO_IncludeRefContentTypeUID;
6060
FOUNDATION_EXPORT NSString *const kCSIO_IncludeCount;
6161
FOUNDATION_EXPORT NSString *const kCSIO_IncludeUnpublished;
62+
FOUNDATION_EXPORT NSString *const kCSIO_IncludeFallback;
6263
FOUNDATION_EXPORT NSString *const kCSIO_BeforeUID;
6364
FOUNDATION_EXPORT NSString *const kCSIO_AfterUID;
6465
FOUNDATION_EXPORT NSString *const kCSIO_Limit;

‎ContentstackInternal/CSIOConstants.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ @implementation CSIOConstants
6363
NSString *const kCSIO_IncludeRefContentTypeUID = @"include_reference_content_type_uid";
6464
NSString *const kCSIO_IncludeCount = @"include_count";
6565
NSString *const kCSIO_IncludeUnpublished = @"include_unpublished";
66+
NSString *const kCSIO_IncludeFallback = @"include_fallback";
6667
//
6768
NSString *const kCSIO_BeforeUID = @"before_uid";
6869
NSString *const kCSIO_AfterUID = @"after_uid";

‎ContentstackInternal/CSIOURLCache.m

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,22 @@ + (instancetype)standardURLCache {
1515
static CSIOURLCache *_standardURLCache;
1616
static dispatch_once_t onceToken;
1717
dispatch_once(&onceToken, ^{
18-
_standardURLCache = [[CSIOURLCache alloc] initWithMemoryCapacity:0 diskCapacity:(20 * 1024 * 1024) diskPath:@"csio_cache"];
18+
#if TARGET_OS_MACCATALYST
19+
_standardURLCache = [[CSIOURLCache alloc] initWithMemoryCapacity:0
20+
diskCapacity:(20 * 1024 * 1024)
21+
directoryURL:[NSURL URLWithString:@"csio_cache"]];
22+
#else
23+
if (@available(iOS 13.0, *))
24+
{
25+
_standardURLCache = [[CSIOURLCache alloc] initWithMemoryCapacity:0
26+
diskCapacity:(20 * 1024 * 1024)
27+
directoryURL:[NSURL URLWithString:@"csio_cache"]];
28+
} else {
29+
_standardURLCache= [[CSIOURLCache alloc] initWithMemoryCapacity:0
30+
diskCapacity:(20 * 1024 * 1024)
31+
diskPath:@"csio_cache"];
32+
}
33+
#endif
1934
});
2035
return _standardURLCache;
2136
}

0 commit comments

Comments
 (0)