Bladeren bron

Remove unnecessary definition in SPM. (#1544)

Frank 4 jaren geleden
bovenliggende
commit
1918f25448
4 gewijzigde bestanden met toevoegingen van 3 en 9 verwijderingen
  1. 1 1
      MJRefresh.podspec
  2. 1 1
      MJRefresh/NSBundle+MJRefresh.m
  3. 0 7
      Package.swift
  4. 1 0
      README.md

+ 1 - 1
MJRefresh.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'MJRefresh'
-    s.version      = '3.7.2'
+    s.version      = '3.7.3'
     s.summary      = 'An easy way to use pull-to-refresh'
     s.homepage     = 'https://github.com/CoderMJLee/MJRefresh'
     s.license      = 'MIT'

+ 1 - 1
MJRefresh/NSBundle+MJRefresh.m

@@ -18,7 +18,7 @@ + (instancetype)mj_refreshBundle
 {
     static NSBundle *refreshBundle = nil;
     if (refreshBundle == nil) {
-#ifdef MJ_SPM
+#ifdef SWIFT_PACKAGE
         NSBundle *containnerBundle = SWIFTPM_MODULE_BUNDLE;
 #else
         NSBundle *containnerBundle = [NSBundle bundleForClass:[MJRefreshComponent class]];

+ 0 - 7
Package.swift

@@ -17,15 +17,8 @@ let package = Package(
             resources: [.process("MJRefresh.bundle")],
             publicHeadersPath: "include",
             cSettings: [
-                //Define macro "MJ_SPM" to identify whether Cocoapods or SPM are being used
-                .define("MJ_SPM"),
                 //Config header path
                 .headerSearchPath("."),
-                .headerSearchPath("Base"),
-                .headerSearchPath("Custom/Footer/Auto"),
-                .headerSearchPath("Custom/Footer/Back"),
-                .headerSearchPath("Custom/Header"),
-                .headerSearchPath("Custom/Trailer"),
             ]
         ),
     ]

+ 1 - 0
README.md

@@ -1,4 +1,5 @@
 ## MJRefresh
+[![SPM supported](https://img.shields.io/badge/SPM-supported-4BC51D.svg?style=flat)](https://github.com/apple/swift-package-manager)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 ![podversion](https://img.shields.io/cocoapods/v/MJRefresh.svg)