Merge pull request #119 from mindbox-moscow/develop

Release 1.3.3

Mindbox.podspec

@@ -1,53 +1,15 @@
-
-
 Pod::Spec.new do |spec|
-
   spec.name         = "Mindbox"
-
-  spec.version      = "1.3.2"
-
+  spec.version      = "1.3.3"
   spec.summary      = "SDK for integration with Mindbox"
-
   spec.description  = "This library allows you to integrate data transfer to Mindbox Marketing Cloud"
-
   spec.homepage     = "https://github.com/mindbox-moscow/ios-sdk"
-
   spec.license      = { :type => "CC BY-NC-ND 4.0", :file => "LICENSE" }
-
   spec.author       = { "Mindbox" => "[email protected]" }
-
   spec.platform     = :ios, "10.0"
-
   spec.source       = { :git => "https://github.com/mindbox-moscow/ios-sdk.git", :tag => spec.version }
-
   spec.source_files  = "Mindbox/**/*.{swift}"
-
   spec.exclude_files = "Classes/Exclude"
-
-
-  # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  A list of resources included with the Pod. These are copied into the
-  #  target bundle with a build phase script. Anything else will be cleaned.
-  #  You can preserve files from being cleaned, please don't preserve
-  #  non-essential files like tests, examples and documentation.
-  #
-
   spec.resources = ["Mindbox/**/*.xcdatamodeld"]
-
-
-  # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  Link your library with frameworks, or libraries. Libraries do not include
-  #  the lib prefix of their name.
-  #
-
-  # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  If your library depends on compiler flags you can set them in the xcconfig hash
-  #  where they will only apply to your library. If you depend on other Podspecs
-  #  you can include multiple dependencies to ensure it works.
-
   spec.swift_version = "5"
-
 end

Mindbox.xcodeproj/project.pbxproj

@@ -448,6 +448,7 @@
 		84FCD3B425CA0FD300D1E574 /* MockPersistenceStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockPersistenceStorage.swift; sourceTree = "<group>"; };
 		84FCD3B825CA109E00D1E574 /* MockNetworkFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockNetworkFetcher.swift; sourceTree = "<group>"; };
 		84FCD3BC25CA10F600D1E574 /* SuccessResponse.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = SuccessResponse.json; sourceTree = "<group>"; };
+		B33127AE2760C53700CF747E /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
 		B36D57842696E59400FEDFD6 /* RetailOrderStatisticsResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetailOrderStatisticsResponse.swift; sourceTree = "<group>"; };
 		B3A6254B2689F83100B6A3B7 /* PersonalOffersResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalOffersResponse.swift; sourceTree = "<group>"; };
 		B3A6254F2689F8B600B6A3B7 /* BenefitResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BenefitResponse.swift; sourceTree = "<group>"; };
@@ -500,6 +501,7 @@
 		313B232625ADEA0F00A1CB72 = {
 			isa = PBXGroup;
 			children = (
+				B33127AE2760C53700CF747E /* Package.swift */,
 				313B233225ADEA0F00A1CB72 /* Mindbox */,
 				313B233D25ADEA0F00A1CB72 /* MindboxTests */,
 				3333C1992681D3CF00B60D84 /* MindboxNotifications */,

Mindbox/Database/DatabaseLoader.swift

@@ -20,11 +20,18 @@ class DataBaseLoader {
 
     init(persistentStoreDescriptions: [NSPersistentStoreDescription]? = nil, applicationGroupIdentifier: String? = nil) throws {
         MBPersistentContainer.applicationGroupIdentifier = applicationGroupIdentifier
-        let bundle = Bundle(for: DataBaseLoader.self)
         let momdName = Constants.Database.mombName
-        guard let modelURL = bundle.url(forResource: momdName, withExtension: "momd") else {
+
+        #if SWIFT_PACKAGE
+        guard let modelURL = Bundle.module.url(forResource: momdName, withExtension: "momd") else {
+            throw MBDatabaseError.unableCreateDatabaseModel
+        }
+        #else
+        guard let modelURL = Bundle(for: DataBaseLoader.self).url(forResource: momdName, withExtension: "momd") else {
             throw MBDatabaseError.unableCreateDatabaseModel
         }
+        #endif
+
         guard let managedObjectModel = NSManagedObjectModel(contentsOf: modelURL) else {
             throw MBDatabaseError.unableCreateManagedObjectModel(with: modelURL)
         }