Skip to content

Commit

Permalink
Merge pull request #46 from contentstack/fix/dx-563-1
Browse files Browse the repository at this point in the history
Fix/dx 563 1
  • Loading branch information
netrajpatel authored Sep 23, 2024
2 parents d99d254 + f1bc273 commit 90961a2
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Build
run: |
# Add commands to build and test your package
xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 13 Pro'
xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 15'
- name: CocoaPods trunk push
run: pod trunk push --allow-warnings
Expand Down
8 changes: 6 additions & 2 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
fileignoreconfig:
- filename: Contentstack.xcodeproj/project.pbxproj
checksum: 331c4ff2e540e9495ff2a0d030ddd7f7c2eda077cb0b1a58c67fc2312b53658e
version: ""
checksum: 10cb4bc5ca755f7392309a88cd6df510a45f8c527ea2f8edc71e1ae1fda60941
- filename: .github/workflows/sast-scan.yml
checksum: 5554abc81d130557f52d64d253c3a23b41fcf0642a9c599131b2c185665ce581
- filename: PrivacyInfo.xcprivacy
checksum: 7697fa6a0a5e0600d35d4678ffff9ef14c5dff5dc1613d37968de7ded3ff1fd0
version: ""
36 changes: 32 additions & 4 deletions Contentstack.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
565E11C01BD76654005AD47F /* MMParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B61BD76654005AD47F /* MMParser.m */; };
565E11C11BD76654005AD47F /* MMScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11B81BD76654005AD47F /* MMScanner.m */; };
565E11C21BD76654005AD47F /* MMSpanParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11BA1BD76654005AD47F /* MMSpanParser.m */; };
64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 238E841B1B4FE29A00BFDB32 /* libThirdPartyExtension.a */; };
64F5220E2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
64F5220F2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 64F5220D2BF5C76E00AE6E0F /* PrivacyInfo.xcprivacy */; };
AC8EFB00BB10FD9E9347B36E /* libPods-ContentstackTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BF5BF157E2FBD4654225A01 /* libPods-ContentstackTest.a */; };
Expand All @@ -126,6 +127,20 @@
remoteGlobalIDString = 230B38BF1C16E98B00444A14;
remoteInfo = Contentstack;
};
64B3EA292BF7C4AF009E0F38 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 23A0F84D1B3801D1003334E9 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 238E841A1B4FE29A00BFDB32;
remoteInfo = ThirdPartyExtension;
};
64F522152BF7C31900AE6E0F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 23A0F84D1B3801D1003334E9 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 238E841A1B4FE29A00BFDB32;
remoteInfo = ThirdPartyExtension;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -243,6 +258,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */,
F08A4E439D49C3F08DD8B39C /* libPods-Contentstack.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -546,6 +562,8 @@
);
dependencies = (
230B39171C1709F800444A14 /* PBXTargetDependency */,
64F522162BF7C31900AE6E0F /* PBXTargetDependency */,
64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */,
);
name = Contentstack;
productName = Contentstack;
Expand Down Expand Up @@ -829,6 +847,16 @@
target = 230B38BF1C16E98B00444A14 /* Contentstack */;
targetProxy = 23A53F5B1E277CD3001DBE35 /* PBXContainerItemProxy */;
};
64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 238E841A1B4FE29A00BFDB32 /* ThirdPartyExtension */;
targetProxy = 64B3EA292BF7C4AF009E0F38 /* PBXContainerItemProxy */;
};
64F522162BF7C31900AE6E0F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 238E841A1B4FE29A00BFDB32 /* ThirdPartyExtension */;
targetProxy = 64F522152BF7C31900AE6E0F /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand All @@ -852,7 +880,7 @@
GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
INFOPLIST_FILE = Contentstack/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -881,7 +909,7 @@
GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
INFOPLIST_FILE = Contentstack/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
OTHER_CFLAGS = "";
Expand Down Expand Up @@ -962,7 +990,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-fembed-bitcode-marker";
Expand Down Expand Up @@ -1011,7 +1039,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-fembed-bitcode";
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PODFILE CHECKSUM: e70b33906e829ccd2b052bc0e0cff91ee8ee49e6

COCOAPODS: 1.15.0
COCOAPODS: 1.14.3

0 comments on commit 90961a2

Please sign in to comment.