Explorar o código

move the "CommonCrypto" from root folder to "Source"

张奇 %!s(int64=8) %!d(string=hai) anos
pai
achega
1e94a7c15e

+ 8 - 8
Kingfisher.podspec

@@ -47,19 +47,19 @@ Pod::Spec.new do |s|
   s.ios.exclude_files = "Sources/NSButton+Kingfisher.swift"
   s.tvos.exclude_files = "Sources/NSButton+Kingfisher.swift"
   
-  s.resources = ['CommonCrypto']
+  s.resources = ['Sources/CommonCrypto']
 
   s.requires_arc = true
   s.framework = "CFNetwork"
 
   s.pod_target_xcconfig = { 
     'SWIFT_VERSION'                              => '4.0', 
-    'SWIFT_INCLUDE_PATHS[sdk=iphoneos*]'         => '$(PODS_TARGET_SRCROOT)/CommonCrypto/iPhoneOS',
-    'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]'  => '$(PODS_TARGET_SRCROOT)/CommonCrypto/iPhoneSimulator', 
-    'SWIFT_INCLUDE_PATHS[sdk=appletvos*]'        => '$(PODS_TARGET_SRCROOT)/CommonCrypto/appleTVOS',
-    'SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]' => '$(PODS_TARGET_SRCROOT)/CommonCrypto/appleTVSimulator',
-    'SWIFT_INCLUDE_PATHS[sdk=macosx*]'           => '$(PODS_TARGET_SRCROOT)/CommonCrypto/macOSX',
-    'SWIFT_INCLUDE_PATHS[sdk=watchos*]'          => '$(PODS_TARGET_SRCROOT)/CommonCrypto/watchOS',
-    'SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]'   => '$(PODS_TARGET_SRCROOT)/CommonCrypto/watchSimulator',
+    'SWIFT_INCLUDE_PATHS[sdk=iphoneos*]'         => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/iPhoneOS',
+    'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]'  => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/iPhoneSimulator', 
+    'SWIFT_INCLUDE_PATHS[sdk=appletvos*]'        => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/appleTVOS',
+    'SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]' => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/appleTVSimulator',
+    'SWIFT_INCLUDE_PATHS[sdk=macosx*]'           => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/macOSX',
+    'SWIFT_INCLUDE_PATHS[sdk=watchos*]'          => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/watchOS',
+    'SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]'   => '$(PODS_TARGET_SRCROOT)/Sources/CommonCrypto/watchSimulator',
   }
 end

+ 14 - 14
Kingfisher.xcodeproj/project.pbxproj

@@ -2531,7 +2531,7 @@
 				PRODUCT_NAME = Kingfisher;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_INCLUDE_PATHS = CommonCrypto/macOSX;
+				SWIFT_INCLUDE_PATHS = Sources/CommonCrypto/macOSX;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -2562,7 +2562,7 @@
 				PRODUCT_NAME = Kingfisher;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_INCLUDE_PATHS = CommonCrypto/macOSX;
+				SWIFT_INCLUDE_PATHS = Sources/CommonCrypto/macOSX;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
@@ -2763,8 +2763,8 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
-				"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = CommonCrypto/appleTVOS;
-				"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = CommonCrypto/appleTVSimulator;
+				"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = Sources/CommonCrypto/appleTVOS;
+				"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = Sources/CommonCrypto/appleTVSimulator;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
@@ -2798,8 +2798,8 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
-				"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = CommonCrypto/appleTVOS;
-				"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = CommonCrypto/appleTVSimulator;
+				"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = Sources/CommonCrypto/appleTVOS;
+				"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = Sources/CommonCrypto/appleTVSimulator;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
@@ -2832,8 +2832,8 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
-				"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = CommonCrypto/watchOS;
-				"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = CommonCrypto/watchSimulator;
+				"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = Sources/CommonCrypto/watchOS;
+				"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = Sources/CommonCrypto/watchSimulator;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
@@ -2864,8 +2864,8 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
-				"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = CommonCrypto/watchOS;
-				"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = CommonCrypto/watchSimulator;
+				"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = Sources/CommonCrypto/watchOS;
+				"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = Sources/CommonCrypto/watchSimulator;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
@@ -3118,8 +3118,8 @@
 				PRODUCT_NAME = Kingfisher;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
-				"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = CommonCrypto/iPhoneOS;
-				"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = CommonCrypto/iPhoneSimulator;
+				"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = Sources/CommonCrypto/iPhoneOS;
+				"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = Sources/CommonCrypto/iPhoneSimulator;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
@@ -3149,8 +3149,8 @@
 				PRODUCT_NAME = Kingfisher;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
-				"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = CommonCrypto/iPhoneOS;
-				"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = CommonCrypto/iPhoneSimulator;
+				"SWIFT_INCLUDE_PATHS[sdk=iphoneos*]" = Sources/CommonCrypto/iPhoneOS;
+				"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = Sources/CommonCrypto/iPhoneSimulator;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;

+ 0 - 0
CommonCrypto/appleTVOS/module.modulemap → Sources/CommonCrypto/appleTVOS/module.modulemap


+ 0 - 0
CommonCrypto/appleTVSimulator/module.modulemap → Sources/CommonCrypto/appleTVSimulator/module.modulemap


+ 0 - 0
CommonCrypto/iPhoneOS/module.modulemap → Sources/CommonCrypto/iPhoneOS/module.modulemap


+ 0 - 0
CommonCrypto/iPhoneSimulator/module.modulemap → Sources/CommonCrypto/iPhoneSimulator/module.modulemap


+ 0 - 0
CommonCrypto/macOSX/module.modulemap → Sources/CommonCrypto/macOSX/module.modulemap


+ 0 - 0
CommonCrypto/watchOS/module.modulemap → Sources/CommonCrypto/watchOS/module.modulemap


+ 0 - 0
CommonCrypto/watchSimulator/module.modulemap → Sources/CommonCrypto/watchSimulator/module.modulemap