Merge pull request MiMo42#33 from Eitot/spm-fix

Add missing header to SPM public header and insert NSBundle macro
TAKeanice · Dec 1, 2020 · 658a980 · 658a980
2 parents 58c9333 + 3a574dd
commit 658a980
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/MMTabBarView/MMTabBarView/MMOverflowPopUpButton.m b/MMTabBarView/MMTabBarView/MMOverflowPopUpButton.m
@@ -9,19 +9,10 @@
 #import "MMOverflowPopUpButton.h"
 
 #import "MMOverflowPopUpButtonCell.h"
-// #import "MMTabBarView.h"
+#import "MMTabBarView.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-#define StaticImage(name) \
-static NSImage* _static##name##Image() \
-{ \
-    static NSImage* image = nil; \
-    if (!image) \
-		image = [[NSBundle bundleForClass:MMOverflowPopUpButtonCell.class] imageForResource:@#name]; \
-    return image; \
-}
-
 @interface MMOverflowPopUpButton ()
 
 @property (assign) CGFloat secondImageAlpha;

diff --git a/MMTabBarView/MMTabBarView/MMTabBarView.m b/MMTabBarView/MMTabBarView/MMTabBarView.m
@@ -258,7 +258,11 @@ + (NSBundle *)bundle;
 {
 	static NSBundle *bundle = nil;
 	if (!bundle) {
-		bundle = [NSBundle bundleForClass:MMTabBarView.class];
+#ifdef SWIFTPM_MODULE_BUNDLE
+        bundle = SWIFTPM_MODULE_BUNDLE;
+#else
+        bundle = [NSBundle bundleForClass:MMTabBarView.class];
+#endif
 	}
 	return bundle;
 }

diff --git a/MMTabBarView/MMTabBarView/include/MMTarBarStyle-SPM.h b/MMTabBarView/MMTabBarView/include/MMTarBarStyle-SPM.h
@@ -25,6 +25,7 @@
 #import "../MMTabBarButtonCell.h"
 #import "../MMTabBarItem.h"
 #import "../MMTabBarView.Globals.h"
+#import "../MMTabBarView.h"
 #import "../MMTabStyle.h"
 #import "../MMUnifiedTabStyle.h"
 #import "../MMYosemiteTabStyle.h"

diff --git a/Package.swift b/Package.swift
@@ -5,6 +5,9 @@ import PackageDescription
 let package = Package(
     name: "MMTabBarView",
     defaultLocalization: LanguageTag("en"),
+    platforms: [
+        .macOS(.v10_10),
+    ],
     products: [
         .library(name: "MMTabBarView", targets: ["MMTabBarView"]),
     ],