feat: Update project structure and dependencies

.env

@@ -1 +1 @@
-CONTENTSTACK_SDK_VERSION=1.5.1
+CONTENTSTACK_SDK_VERSION=2.0.0

Cartfile

@@ -1,2 +1,2 @@
-github "contentstack/contentstack-swift-dvr" "master"
+github "contentstack/contentstack-swift-dvr" 
 github "contentstack/contentstack-utils-swift"

Config.xcconfig

@@ -1 +1 @@
-CONTENTSTACK_SDK_VERSION = 1.5.1
+CONTENTSTACK_SDK_VERSION = 2.0.0

ContentstackSwift.podspec

@@ -7,11 +7,10 @@
 #
 #!/usr/bin/ruby
 
-require 'dotenv/load'
 
 Pod::Spec.new do |s|
   s.name             = 'ContentstackSwift'
-  s.version          = ENV['CONTENTSTACK_SDK_VERSION']
+  s.version          = '2.0.0'
   s.summary          = 'Contentstack is a headless CMS with an API-first approach that puts content at the centre.'
 
   s.description      = <<-DESC
@@ -29,14 +28,14 @@ Pod::Spec.new do |s|
     'uttamukkoji' => '[email protected]',
     'Contentstack' => '[email protected]'
   }
-  s.source           = { :git => 'https://github.com/contentstack/contentstack-swift.git', :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/Contentstack'
-  s.swift_version             = '5'
-
-  s.ios.deployment_target = '11.0'
-  s.osx.deployment_target     = '10.13'
-  s.watchos.deployment_target = '4.0'
-  s.tvos.deployment_target    = '11.0'
+  s.source           = { :git => 'https://github.com/contentstack/contentstack-swift.git', :tag => s.version }
+  s.social_media_url = 'https://x.com/Contentstack'
+  s.swift_version             = '5.6'
+
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target     = '10.15'
+  s.watchos.deployment_target = '6.0'
+  s.tvos.deployment_target    = '13.0'
 
 
   s.source_files = 'Sources/**/*'

ContentstackSwift.xcodeproj/ContentstackTests_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

ContentstackSwift.xcodeproj/Contentstack_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

ContentstackSwift.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>

ContentstackSwift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -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>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+    <false/>
+</dict>
+</plist>

ContentstackSwift.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0F4A75D2241BAC4300E3A024"
+               BuildableName = "Contentstack iOS Tests.xctest"
+               BlueprintName = "Contentstack iOS Tests"
+               ReferencedContainer = "container:Contentstack.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      consoleMode = "0"
+      structuredConsoleMode = "1">
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ContentstackSwift.xcodeproj/xcshareddata/xcschemes/Contentstack iOS.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0F4A75CA241BAC4300E3A024"
+               BuildableName = "Contentstack.framework"
+               BlueprintName = "Contentstack iOS"
+               ReferencedContainer = "container:Contentstack.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0F4A75CA241BAC4300E3A024"
+            BuildableName = "Contentstack.framework"
+            BlueprintName = "Contentstack iOS"
+            ReferencedContainer = "container:Contentstack.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.6
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -20,21 +20,24 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/contentstack/contentstack-utils-swift.git", .branch("master")),
+        .package(url: "https://github.com/contentstack/contentstack-utils-swift.git", exact:"1.3.4"),
         // Dev dependencies
-        .package(url: "https://github.com/contentstack/contentstack-swift-dvr.git", .branch("master"))
+        .package(url: "https://github.com/contentstack/contentstack-swift-dvr.git", branch:"master")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package,
         //and on products in packages which this package depends on.
         .target(
             name: "ContentstackSwift",
-            dependencies: ["ContentstackUtils"],
+            dependencies: [
+                .product(name: "ContentstackUtils", package: "contentstack-utils-swift"), 
+                .product(name: "DVR", package: "contentstack-swift-dvr")],
             path: "Sources"),
         .testTarget(
             name: "ContentstackTests",
-            dependencies: ["ContentstackSwift", "DVR"],
+            dependencies: ["ContentstackSwift", 
+                           .product(name: "DVR", package: "contentstack-swift-dvr")],
             path: "Tests")
     ]
 )

Scripts/.env

@@ -1 +1 @@
-CONTENTSTACK_SDK_VERSION=1.4.0
+CONTENTSTACK_SDK_VERSION=2.0.0

Tests/AssetQueryAPITest.swift

@@ -7,7 +7,7 @@
 
 import XCTest
 
-@testable import Contentstack
+@testable import ContentstackSwift
 import DVR
 
 class AssetQueryAPITest: XCTestCase {

Tests/AssetQueryTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 class AssetQueryTest: XCTestCase {
 
     let testStringValue = "TESTVALUE"

Tests/AssetTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 class AssetTest: XCTestCase {
 
     func testEndPoint() {

Tests/ContentStackLogTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 
 class CustomeLogMessage: CustomLogger {
 

Tests/ContentTypeQueryAPITest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 import DVR
 
 class ContentTypeQueryAPITest: XCTestCase {

Tests/ContentTypeQueryTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 class ContentTypeQueryTest: XCTestCase {
     let testStringValue = "TESTVALUE"
     let testIntValue = 100

Tests/ContentTypeTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 
 final class ContentTypeTests: XCTestCase {
     let uid = "testUID"

Tests/ContentstackConfigTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 class ContentstackConfigTest: XCTestCase {
 
     func testUserAgent() {

Tests/ContentstackTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 import DVR
 private var _stackSharedInstance: Stack?
 

Tests/ContentstackTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 
 final class ContentstackTests: XCTestCase {
 

Tests/DateTest.swift

@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Contentstack
+@testable import ContentstackSwift
 class DateTest: XCTestCase {
 
     func testDateFormatter_withMultipleDateFormat() {