Fixed project for SPM

izyumkin · Dec 25, 2022 · 4fb2755 · 4fb2755
1 parent ca6b39b
commit 4fb2755
Show file tree

Hide file tree

Showing 10 changed files with 366 additions and 383 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.swiftpm/
+.DS_Store
diff --git a/MCEmojiPicker.xcodeproj/MCEmojiPicker_Info.plist b/MCEmojiPicker.xcodeproj/MCEmojiPicker_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>
diff --git a/MCEmojiPicker.xcodeproj/project.pbxproj b/MCEmojiPicker.xcodeproj/project.pbxproj
diff --git a/MCEmojiPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MCEmojiPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/MCEmojiPicker.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/MCEmojiPicker.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>
diff --git a/...roj/project.xcworkspace/xcuserdata/ivanizumkin.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/ivanizumkin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MCEmojiPicker.xcodeproj/xcshareddata/xcschemes/MCEmojiPicker-Package.xcscheme b/MCEmojiPicker.xcodeproj/xcshareddata/xcschemes/MCEmojiPicker-Package.xcscheme
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "9999"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "mcemojipicker::MCEmojiPicker"
+               BuildableName = "MCEmojiPicker.framework"
+               BlueprintName = "MCEmojiPicker"
+               ReferencedContainer = "container:MCEmojiPicker.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </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">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version: 5.7
 
 import PackageDescription
 

diff --git a/Sources/MCEmojiPicker/Resource/Extensions/Bundle+Extension.swift b/Sources/MCEmojiPicker/Resource/Extensions/Bundle+Extension.swift
@@ -0,0 +1,21 @@
+//
+//  Bundle+Extension.swift
+//  MCEmojiPicker
+//
+//  Created by Иван Изюмкин on 25.12.2022.
+//
+
+import Foundation
+
+#if !SPM
+extension Bundle {
+    /// Localization bundle.
+    static var module: Bundle {
+        let path = Bundle(for: MCUnicodeManager.self).path(
+            forResource: "MCEmojiPicker",
+            ofType: "bundle"
+        ) ?? ""
+        return Bundle(path: path) ?? Bundle.main
+    }
+}
+#endif
diff --git a/Sources/MCEmojiPicker/Services/MCUnicodeManager.swift b/Sources/MCEmojiPicker/Services/MCUnicodeManager.swift
@@ -56,29 +56,26 @@ final class MCUnicodeManager: MCUnicodeManagerProtocol {
      - Parameter type: Emoji category type.
      */
     public func getEmojiCategoryTitle(for type: MCEmojiCategoryType) -> String {
-        let path = Bundle(for: MCUnicodeManager.self).path(forResource: "MCEmojiPicker", ofType: "bundle") ?? ""
-        // Localization bundle.
-        let bundle = Bundle(path: path) ?? Bundle.main
         // Localization file name.
         let localizationTableName = "MCEmojiPickerLocalizable"
 
         switch type {
         case .people:
-            return NSLocalizedString("emotionsAndPeople", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("emotionsAndPeople", tableName: localizationTableName, bundle: .module, comment: "")
         case .nature:
-            return NSLocalizedString("animalsAndNature", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("animalsAndNature", tableName: localizationTableName, bundle: .module, comment: "")
         case .foodAndDrink:
-            return NSLocalizedString("foodAndDrinks", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("foodAndDrinks", tableName: localizationTableName, bundle: .module, comment: "")
         case .activity:
-            return NSLocalizedString("activities", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("activities", tableName: localizationTableName, bundle: .module, comment: "")
         case .travelAndPlaces:
-            return NSLocalizedString("travellingAndPlaces", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("travellingAndPlaces", tableName: localizationTableName, bundle: .module, comment: "")
         case .objects:
-            return NSLocalizedString("items", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("items", tableName: localizationTableName, bundle: .module, comment: "")
         case .symbols:
-            return NSLocalizedString("symbols", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("symbols", tableName: localizationTableName, bundle: .module, comment: "")
         case .flags:
-            return NSLocalizedString("flags", tableName: localizationTableName, bundle: bundle, comment: "")
+            return NSLocalizedString("flags", tableName: localizationTableName, bundle: .module, comment: "")
         }
     }
 }