Skip to content

Commit f2fa96a

Browse files
authored
Merge pull request #33 from contentstack/feat/dx-85
Feat/dx 85
2 parents 2be5ac8 + 496b948 commit f2fa96a

File tree

7 files changed

+64
-5
lines changed

7 files changed

+64
-5
lines changed

.talismanrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
threshold: medium
1+
fileignoreconfig:
2+
- filename: Contentstack.xcodeproj/project.pbxproj
3+
checksum: 331c4ff2e540e9495ff2a0d030ddd7f7c2eda077cb0b1a58c67fc2312b53658e
4+
version: ""

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
### Version: 3.12.3
2+
#### Date: May-16-2023
3+
4+
##### Enhancement:
5+
- Added support for GCP_NA region
6+
7+
### Version: 3.12.2
8+
#### Date: Mar-22-2024
9+
10+
##### Bug Fix:
11+
- fixed issue while importing headers
12+
13+
### Version: 3.12.1
14+
#### Date: Feb-01-2024
15+
16+
##### Enhancement:
17+
- Retry URL request on 408, 429 errors
18+
119
### Version: 3.12.0
220
#### Date: May-26-2023
321

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.12.2'
3+
s.version = '3.12.3'
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.12.2' }
15+
s.source = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.12.3' }
1616
s.social_media_url = 'https://twitter.com/Contentstack'
1717

1818
s.ios.deployment_target = '11.0'

Contentstack.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
565E11C01BD76654005AD47F /* MMParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B61BD76654005AD47F /* MMParser.m */; };
104104
565E11C11BD76654005AD47F /* MMScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B81BD76654005AD47F /* MMScanner.m */; };
105105
565E11C21BD76654005AD47F /* MMSpanParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11BA1BD76654005AD47F /* MMSpanParser.m */; };
106+
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
107+
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
106108
AC8EFB00BB10FD9E9347B36E /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BF5BF157E2FBD4654225A01 /* libPods-ContentstackTest.a */; };
107109
F08A4E439D49C3F08DD8B39C /* libPods-Contentstack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D36158266EF475AC2496807A /* libPods-Contentstack.a */; };
108110
/* End PBXBuildFile section */
@@ -223,6 +225,7 @@
223225
565E11B81BD76654005AD47F /* MMScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMScanner.m; sourceTree = "<group>"; };
224226
565E11B91BD76654005AD47F /* MMSpanParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMSpanParser.h; sourceTree = "<group>"; };
225227
565E11BA1BD76654005AD47F /* MMSpanParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMSpanParser.m; sourceTree = "<group>"; };
228+
64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
226229
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>"; };
227230
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>"; };
228231
9980728A1E1BDC5000524FD3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -341,6 +344,7 @@
341344
23A0F84C1B3801D1003334E9 = {
342345
isa = PBXGroup;
343346
children = (
347+
64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */,
344348
0F0A70AD225DEDDF00E0284F /* Contentstack.podspec */,
345349
9980728A1E1BDC5000524FD3 /* README.md */,
346350
0F6C89AC225CCE9F004C342A /* CHANGELOG.md */,
@@ -629,13 +633,15 @@
629633
isa = PBXResourcesBuildPhase;
630634
buildActionMask = 2147483647;
631635
files = (
636+
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
632637
);
633638
runOnlyForDeploymentPostprocessing = 0;
634639
};
635640
23A53F531E277CD3001DBE35 /* Resources */ = {
636641
isa = PBXResourcesBuildPhase;
637642
buildActionMask = 2147483647;
638643
files = (
644+
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
639645
0F41A91625C7CC9C007EF2DA /* config.json in Resources */,
640646
);
641647
runOnlyForDeploymentPostprocessing = 0;

Contentstack/ContentstackDefinitions.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
US = 0,
8080
EU,
8181
AZURE_NA,
82-
AZURE_EU
82+
AZURE_EU,
83+
GCP_NA
8384
};
8485

8586
typedef NS_ENUM(NSUInteger, Language) {

ContentstackInternal/NSObject+Extensions.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ -(NSArray*)hostURLS {
4343
static dispatch_once_t hostURLSOnceToken;
4444
dispatch_once(&hostURLSOnceToken, ^{
4545
hostURLS = @[@"cdn.contentstack.io",
46+
@"cdn.contentstack.com",
4647
@"cdn.contentstack.com",
4748
@"cdn.contentstack.com",
4849
@"cdn.contentstack.com"];
@@ -61,7 +62,8 @@ -(NSArray*)regionCodes {
6162
regionCodes = @[@"us",
6263
@"eu",
6364
@"azure-na",
64-
@"azure-eu"];
65+
@"azure-eu",
66+
@"gcp-na"];
6567
});
6668
return regionCodes;
6769
}

PrivacyInfo.xcprivacy

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyTracking</key>
6+
<false/>
7+
<key>NSPrivacyTrackingDomains</key>
8+
<array/>
9+
<key>NSPrivacyAccessedAPITypes</key>
10+
<array>
11+
<dict/>
12+
</array>
13+
<key>NSPrivacyCollectedDataTypes</key>
14+
<array>
15+
<dict>
16+
<key>NSPrivacyCollectedDataType</key>
17+
<string></string>
18+
<key>NSPrivacyCollectedDataTypeLinked</key>
19+
<false/>
20+
<key>NSPrivacyCollectedDataTypeTracking</key>
21+
<false/>
22+
<key>NSPrivacyCollectedDataTypePurposes</key>
23+
<array>
24+
<string></string>
25+
</array>
26+
</dict>
27+
</array>
28+
</dict>
29+
</plist>

0 commit comments

Comments
 (0)