Skip to content

Commit cd04902

Browse files
abhinav-from-contentstackabhinav-from-contentstack
committed
Merge branch 'master' into fix/dx-563-1
2 parents 51cf937 + 9154ab2 commit cd04902

File tree

10 files changed

+123
-8
lines changed

10 files changed

+123
-8
lines changed

‎.github/workflows/jira.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Create JIRA ISSUE
2+
on:
3+
pull_request:
4+
types: [opened]
5+
jobs:
6+
security-jira:
7+
if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-') || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Login into JIRA
12+
uses: atlassian/gajira-login@master
13+
env:
14+
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
15+
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
16+
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
17+
- name: Create a JIRA Issue
18+
id: create
19+
uses: atlassian/gajira-create@master
20+
with:
21+
project: ${{ secrets.JIRA_PROJECT }}
22+
issuetype: ${{ secrets.JIRA_ISSUE_TYPE }}
23+
summary: |
24+
${{ github.event.pull_request.title }}
25+
description: |
26+
PR: ${{ github.event.pull_request.html_url }}
27+
28+
fields: "${{ secrets.JIRA_FIELDS }}"
29+
- name: Transition issue
30+
uses: atlassian/gajira-transition@v3
31+
with:
32+
issue: ${{ steps.create.outputs.issue }}
33+
transition: ${{ secrets.JIRA_TRANSITION }}

‎.github/workflows/sast-scan.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: SAST Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security-sast:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Semgrep Scan
11+
run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v "${PWD}:/src" returntocorp/semgrep semgrep scan --config auto

‎.github/workflows/sca-scan.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Source Composition Analysis Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security-sca:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@master
10+
- uses: snyk/actions/setup@master
11+
- name: Run Snyk to check for vulnerabilities
12+
run: snyk test --all-projects --fail-on=all
13+
env:
14+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

‎.talismanrc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fileignoreconfig:
22
- filename: Contentstack.xcodeproj/project.pbxproj
3-
checksum: b0aefacbd6d0de17381f114d10907a14dcf871abf090b73ff436076dd7cf6c0b
4-
- filename: Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack.xcscheme
5-
checksum: aae81782423ca868aa41c7f8db06d3c060836785d7ea4737ede5e4c4cd2e7a1b
3+
checksum: 10cb4bc5ca755f7392309a88cd6df510a45f8c527ea2f8edc71e1ae1fda60941
4+
- filename: .github/workflows/sast-scan.yml
5+
checksum: 5554abc81d130557f52d64d253c3a23b41fcf0642a9c599131b2c185665ce581
6+
- filename: PrivacyInfo.xcprivacy
7+
checksum: 7697fa6a0a5e0600d35d4678ffff9ef14c5dff5dc1613d37968de7ded3ff1fd0
68
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' => '[email protected]' }
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +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-
64F522142BF7C31900AE6E0F /* libThirdPartyExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 238E841B1B4FE29A00BFDB32 /* libThirdPartyExtension.a */; };
106+
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
107+
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
107108
AC8EFB00BB10FD9E9347B36E /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BF5BF157E2FBD4654225A01 /* libPods-ContentstackTest.a */; };
108109
F08A4E439D49C3F08DD8B39C /* libPods-Contentstack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D36158266EF475AC2496807A /* libPods-Contentstack.a */; };
109110
/* End PBXBuildFile section */
@@ -231,6 +232,7 @@
231232
565E11B81BD76654005AD47F /* MMScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMScanner.m; sourceTree = "<group>"; };
232233
565E11B91BD76654005AD47F /* MMSpanParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMSpanParser.h; sourceTree = "<group>"; };
233234
565E11BA1BD76654005AD47F /* MMSpanParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMSpanParser.m; sourceTree = "<group>"; };
235+
64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
234236
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>"; };
235237
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>"; };
236238
9980728A1E1BDC5000524FD3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -350,6 +352,7 @@
350352
23A0F84C1B3801D1003334E9 = {
351353
isa = PBXGroup;
352354
children = (
355+
64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */,
353356
0F0A70AD225DEDDF00E0284F /* Contentstack.podspec */,
354357
9980728A1E1BDC5000524FD3 /* README.md */,
355358
0F6C89AC225CCE9F004C342A /* CHANGELOG.md */,
@@ -639,13 +642,15 @@
639642
isa = PBXResourcesBuildPhase;
640643
buildActionMask = 2147483647;
641644
files = (
645+
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
642646
);
643647
runOnlyForDeploymentPostprocessing = 0;
644648
};
645649
23A53F531E277CD3001DBE35 /* Resources */ = {
646650
isa = PBXResourcesBuildPhase;
647651
buildActionMask = 2147483647;
648652
files = (
653+
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
649654
0F41A91625C7CC9C007EF2DA /* config.json in Resources */,
650655
);
651656
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)