Fix/dx 563 1

.github/workflows/release-package.yml

@@ -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

.talismanrc

@@ -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: ""

Contentstack.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = 'Contentstack'
-s.version          = '3.12.3'
+s.version          = '3.13.0'
 s.summary          = 'Contentstack is a headless CMS with an API-first approach that puts content at the centre.'
 
 s.description      = <<-DESC
@@ -12,7 +12,7 @@ s.homepage         = 'https://www.contentstack.com/'
 s.license          = { :type => 'Commercial',:text => 'See https://www.contentstack.com/'}
 s.author           = { 'Contentstack' => '[email protected]' }
 
-s.source           = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.12.3' }
+s.source           = { :git => 'https://github.com/contentstack/contentstack-ios.git', :tag => 'v3.13.0' }
 s.social_media_url = 'https://twitter.com/Contentstack'
 
 s.ios.deployment_target = '11.0'

Contentstack.xcodeproj/project.pbxproj

@@ -95,6 +95,8 @@
 		23A53F501E277BBE001DBE35 /* NSObject+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A53F331E276BA5001DBE35 /* NSObject+Extensions.m */; };
 		23A53F5A1E277CD3001DBE35 /* Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 230B38C01C16E98B00444A14 /* Contentstack.framework */; };
 		23B6F12A1B5662EE00A9E983 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B6F1281B5662EE00A9E983 /* ISO8601DateFormatter.m */; };
+		4714B7D42C5EAFCC004E941E /* Taxonomy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4714B7D32C5EAFCC004E941E /* Taxonomy.m */; };
+		479EC6642C5FCBDC00C5630B /* Taxonomy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4714B7D52C5EAFF5004E941E /* Taxonomy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		565E11BB1BD76654005AD47F /* MMDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AA1BD76654005AD47F /* MMDocument.m */; };
 		565E11BC1BD76654005AD47F /* MMElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AD1BD76654005AD47F /* MMElement.m */; };
 		565E11BD1BD76654005AD47F /* MMGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AF1BD76654005AD47F /* MMGenerator.m */; };
@@ -103,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 */; };
@@ -124,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 */
@@ -207,6 +224,8 @@
 		23B6F1281B5662EE00A9E983 /* ISO8601DateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ISO8601DateFormatter.m; sourceTree = "<group>"; };
 		23C545FB1C1976FE007BBD27 /* ios-build-framework-script.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "ios-build-framework-script.sh"; sourceTree = "<group>"; };
 		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>"; };
+		4714B7D32C5EAFCC004E941E /* Taxonomy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Taxonomy.m; sourceTree = "<group>"; };
+		4714B7D52C5EAFF5004E941E /* Taxonomy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Taxonomy.h; sourceTree = "<group>"; };
 		565E11A91BD76654005AD47F /* MMDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDocument.h; sourceTree = "<group>"; };
 		565E11AA1BD76654005AD47F /* MMDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMDocument.m; sourceTree = "<group>"; };
 		565E11AB1BD76654005AD47F /* MMDocument_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDocument_Private.h; sourceTree = "<group>"; };
@@ -239,6 +258,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64B3EA282BF7C4AF009E0F38 /* libThirdPartyExtension.a in Frameworks */,
 				F08A4E439D49C3F08DD8B39C /* libPods-Contentstack.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -315,6 +335,8 @@
 				0FD6BAEE29CD6E73001A0930 /* CSURLSessionDelegate.h */,
 				0F9C0FAF221ADAC90091205A /* ThirdPartyNamespaceHeader */,
 				230B38C41C16E98B00444A14 /* Info.plist */,
+				4714B7D32C5EAFCC004E941E /* Taxonomy.m */,
+				4714B7D52C5EAFF5004E941E /* Taxonomy.h */,
 			);
 			path = Contentstack;
 			sourceTree = "<group>";
@@ -492,6 +514,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				479EC6642C5FCBDC00C5630B /* Taxonomy.h in Headers */,
 				0F9C0FC8221ADAC90091205A /* NamespacedDependencies.h in Headers */,
 				23A53F3C1E276C83001DBE35 /* CSIOAPIURLs.h in Headers */,
 				23A53F3E1E276C83001DBE35 /* CSIOCoreHTTPNetworking.h in Headers */,
@@ -539,6 +562,8 @@
 			);
 			dependencies = (
 				230B39171C1709F800444A14 /* PBXTargetDependency */,
+				64F522162BF7C31900AE6E0F /* PBXTargetDependency */,
+				64B3EA2A2BF7C4AF009E0F38 /* PBXTargetDependency */,
 			);
 			name = Contentstack;
 			productName = Contentstack;
@@ -769,6 +794,7 @@
 				230B38EA1C16EB4400444A14 /* MMScanner.m in Sources */,
 				230B38E81C16EB4400444A14 /* MMMarkdown.m in Sources */,
 				230B38E91C16EB4400444A14 /* MMParser.m in Sources */,
+				4714B7D42C5EAFCC004E941E /* Taxonomy.m in Sources */,
 				230B38E51C16EB4400444A14 /* MMElement.m in Sources */,
 				230B39021C16EB8F00444A14 /* ISO8601DateFormatter.m in Sources */,
 				230B38E61C16EB4400444A14 /* MMGenerator.m in Sources */,
@@ -821,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 */
@@ -839,12 +875,12 @@
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/ThirdPartyExtension",
+					"$(PROJECT_DIR)/ThirdPartyExtension/**",
 				);
 				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;
@@ -868,12 +904,12 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/ThirdPartyExtension",
+					"$(PROJECT_DIR)/ThirdPartyExtension/**",
 				);
 				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 = "";
@@ -917,7 +953,7 @@
 		23A0F86A1B3801D1003334E9 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				BITCODE_GENERATION_MODE = marker;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -954,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";
@@ -972,7 +1008,7 @@
 		23A0F86B1B3801D1003334E9 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1003,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";

Contentstack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack.xcscheme

@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "230B38BF1C16E98B00444A14"
+            BuildableName = "Contentstack.framework"
+            BlueprintName = "Contentstack"
+            ReferencedContainer = "container:Contentstack.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,20 +48,9 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "230B38BF1C16E98B00444A14"
-            BuildableName = "Contentstack.framework"
-            BlueprintName = "Contentstack"
-            ReferencedContainer = "container:Contentstack.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -70,11 +68,9 @@
             ReferencedContainer = "container:Contentstack.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -93,7 +89,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

Contentstack/Contentstack.h

@@ -12,6 +12,7 @@
 #import <Contentstack/Config.h>
 #import <Contentstack/Stack.h>
 #import <Contentstack/ContentType.h>
+#import <Contentstack/Taxonomy.h>
 #import <Contentstack/Entry.h>
 #import <Contentstack/Query.h>
 #import <Contentstack/Asset.h>

Contentstack/Entry.m

@@ -49,6 +49,16 @@ - (instancetype)initWithContentType:(ContentType*)contentType withEntryUID:(NSSt
     return self;
 }
 
+- (instancetype)initWithTaxonomy:(Taxonomy *)taxonomy {
+    if (self = [super init]) {
+        _taxonomy = taxonomy;
+        _localHeaders = [NSMutableDictionary dictionary];
+        _objectProperties = [NSMutableDictionary dictionary];
+        _postParamDictionary = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
 -(void)setLanguage:(Language)language {
     _language = language;
     [self setLocale:[self localeCode:language]];
@@ -63,6 +73,9 @@ - (instancetype)initWithContentType:(ContentType*)contentType {
     return [self initWithContentType:contentType withEntryUID:nil];
 }
 
+//- (instancetype)initWithTaxonomy:(Taxonomy*)taxonomy {
+//    return [self initWithTaxonomy:taxonomy];
+//}
 //MARK: - Headers -
 
 - (void)setHeader:(NSString *)headerValue forKey:(NSString *)headerKey {

Contentstack/Query.h

@@ -130,6 +130,8 @@ This method provides all the entries for the specified language in the response.
  */
 - (void)search:(NSString *)searchString;
 
+- (void)query:(NSDictionary *)queryString;
+
 //MARK: - Tags -
 /**---------------------------------------------------------------------------------------
  * @name Tags
@@ -759,6 +761,9 @@ This method provides all the entries from a specified contenttype.
  */
 - (void)find:(void (^) (ResponseType type,QueryResult * BUILT_NULLABLE_P result,NSError * BUILT_NULLABLE_P error))completionBlock;
 
+
+- (void)findTaxonomy:(void (^) (ResponseType type,QueryResult * BUILT_NULLABLE_P result,NSError * BUILT_NULLABLE_P error))completionBlock;
+
 /**
 This method provides the first entry from a specified contenttype.