Skip to content

Commit 90961a2

Browse files
authored
Merge pull request #46 from contentstack/fix/dx-563-1
Fix/dx 563 1
2 parents d99d254 + f1bc273 commit 90961a2

File tree

4 files changed

+40
-8
lines changed

4 files changed

+40
-8
lines changed

.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.xcodeproj/project.pbxproj

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +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+
64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 238E841B1B4FE29A00BFDB32 /* libThirdPartyExtension.a */; };
108109
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
109110
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
110111
AC8EFB00BB10FD9E9347B36E /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BF5BF157E2FBD4654225A01 /* libPods-ContentstackTest.a */; };
@@ -126,6 +127,20 @@
126127
remoteGlobalIDString = 230B38BF1C16E98B00444A14;
127128
remoteInfo = Contentstack;
128129
};
130+
64B3EA292BF7C4AF009E0F38 /* PBXContainerItemProxy */ = {
131+
isa = PBXContainerItemProxy;
132+
containerPortal = 23A0F84D1B3801D1003334E9 /* Project object */;
133+
proxyType = 1;
134+
remoteGlobalIDString = 238E841A1B4FE29A00BFDB32;
135+
remoteInfo = ThirdPartyExtension;
136+
};
137+
64F522152BF7C31900AE6E0F /* PBXContainerItemProxy */ = {
138+
isa = PBXContainerItemProxy;
139+
containerPortal = 23A0F84D1B3801D1003334E9 /* Project object */;
140+
proxyType = 1;
141+
remoteGlobalIDString = 238E841A1B4FE29A00BFDB32;
142+
remoteInfo = ThirdPartyExtension;
143+
};
129144
/* End PBXContainerItemProxy section */
130145

131146
/* Begin PBXCopyFilesBuildPhase section */
@@ -243,6 +258,7 @@
243258
isa = PBXFrameworksBuildPhase;
244259
buildActionMask = 2147483647;
245260
files = (
261+
64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */,
246262
F08A4E439D49C3F08DD8B39C /* libPods-Contentstack.a in Frameworks */,
247263
);
248264
runOnlyForDeploymentPostprocessing = 0;
@@ -546,6 +562,8 @@
546562
);
547563
dependencies = (
548564
230B39171C1709F800444A14 /* PBXTargetDependency */,
565+
64F522162BF7C31900AE6E0F /* PBXTargetDependency */,
566+
64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */,
549567
);
550568
name = Contentstack;
551569
productName = Contentstack;
@@ -829,6 +847,16 @@
829847
target = 230B38BF1C16E98B00444A14 /* Contentstack */;
830848
targetProxy = 23A53F5B1E277CD3001DBE35 /* PBXContainerItemProxy */;
831849
};
850+
64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */ = {
851+
isa = PBXTargetDependency;
852+
target = 238E841A1B4FE29A00BFDB32 /* ThirdPartyExtension */;
853+
targetProxy = 64B3EA292BF7C4AF009E0F38 /* PBXContainerItemProxy */;
854+
};
855+
64F522162BF7C31900AE6E0F /* PBXTargetDependency */ = {
856+
isa = PBXTargetDependency;
857+
target = 238E841A1B4FE29A00BFDB32 /* ThirdPartyExtension */;
858+
targetProxy = 64F522152BF7C31900AE6E0F /* PBXContainerItemProxy */;
859+
};
832860
/* End PBXTargetDependency section */
833861

834862
/* Begin XCBuildConfiguration section */
@@ -852,7 +880,7 @@
852880
GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
853881
INFOPLIST_FILE = Contentstack/Info.plist;
854882
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
855-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
883+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
856884
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
857885
MACH_O_TYPE = staticlib;
858886
ONLY_ACTIVE_ARCH = YES;
@@ -881,7 +909,7 @@
881909
GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
882910
INFOPLIST_FILE = Contentstack/Info.plist;
883911
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
884-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
912+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
885913
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
886914
MACH_O_TYPE = staticlib;
887915
OTHER_CFLAGS = "";
@@ -962,7 +990,7 @@
962990
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
963991
GCC_WARN_UNUSED_FUNCTION = YES;
964992
GCC_WARN_UNUSED_VARIABLE = YES;
965-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
993+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
966994
MTL_ENABLE_DEBUG_INFO = YES;
967995
ONLY_ACTIVE_ARCH = NO;
968996
OTHER_CFLAGS = "-fembed-bitcode-marker";
@@ -1011,7 +1039,7 @@
10111039
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10121040
GCC_WARN_UNUSED_FUNCTION = YES;
10131041
GCC_WARN_UNUSED_VARIABLE = YES;
1014-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1042+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
10151043
MTL_ENABLE_DEBUG_INFO = NO;
10161044
ONLY_ACTIVE_ARCH = NO;
10171045
OTHER_CFLAGS = "-fembed-bitcode";

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PODFILE CHECKSUM: e70b33906e829ccd2b052bc0e0cff91ee8ee49e6
22

3-
COCOAPODS: 1.15.0
3+
COCOAPODS: 1.14.3

0 commit comments

Comments
 (0)