onevcat 10 rokov pred
rodič
commit
65a6697539

+ 7 - 7
Kingfisher.podspec

@@ -31,15 +31,15 @@ Pod::Spec.new do |s|
 
 
   s.source       = { :git => "https://github.com/onevcat/Kingfisher.git", :tag => s.version }
   s.source       = { :git => "https://github.com/onevcat/Kingfisher.git", :tag => s.version }
   
   
-  s.ios.source_files  = ["Kingfisher/*.swift", "Kingfisher/Kingfisher.h"]
-  s.ios.public_header_files = ["Kingfisher/Kingfisher.h"]
+  s.ios.source_files  = ["Sources/Kingfisher/*.swift", "Sources/Kingfisher/Kingfisher.h"]
+  s.ios.public_header_files = ["Sources/Kingfisher/Kingfisher.h"]
   
   
-  s.osx.source_files  = ["Kingfisher/*.swift", "Kingfisher-OSX/Kingfisher-OSX.h"]
-  s.osx.exclude_files = "Kingfisher/UIButton+Kingfisher.swift"
-  s.osx.public_header_files = ["Kingfisher-OSX/Kingfisher-OSX.h"]
+  s.osx.source_files  = ["Sources/Kingfisher/*.swift", "Sources/Kingfisher-OSX/Kingfisher-OSX.h"]
+  s.osx.exclude_files = "Sources/Kingfisher/UIButton+Kingfisher.swift"
+  s.osx.public_header_files = ["Sources/Kingfisher-OSX/Kingfisher-OSX.h"]
   
   
-  s.tvos.source_files  = ["Kingfisher/*.swift", "Kingfisher-tvOS/Kingfisher-tvOS.h"]
-  s.tvos.public_header_files = ["Kingfisher-tvOS/Kingfisher-tvOS.h"]
+  s.tvos.source_files  = ["Sources/Kingfisher/*.swift", "Sources/Kingfisher-tvOS/Kingfisher-tvOS.h"]
+  s.tvos.public_header_files = ["Sources/Kingfisher-tvOS/Kingfisher-tvOS.h"]
   
   
   s.requires_arc = true
   s.requires_arc = true
   s.framework = "CFNetwork"
   s.framework = "CFNetwork"

+ 6 - 2
Kingfisher.xcodeproj/project.pbxproj

@@ -1575,6 +1575,7 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = "Demo/Kingfisher-Demo/Info.plist";
 				INFOPLIST_FILE = "Demo/Kingfisher-Demo/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -1588,6 +1589,7 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = "Demo/Kingfisher-Demo/Info.plist";
 				INFOPLIST_FILE = "Demo/Kingfisher-Demo/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -1601,7 +1603,8 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 418;
 				CURRENT_PROJECT_VERSION = 418;
 				DEFINES_MODULE = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1628,7 +1631,8 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 418;
 				CURRENT_PROJECT_VERSION = 418;
 				DEFINES_MODULE = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_COMPATIBILITY_VERSION = 1;

+ 11 - 0
fastlane/Fastfile

@@ -20,6 +20,17 @@ platform :ios do
       Actions.sh("cd .. && carthage build --no-skip-current && cd fastlane")
       Actions.sh("cd .. && carthage build --no-skip-current && cd fastlane")
   end
   end
   
   
+  desc "Lint for Cocoapod"
+  lane :pod_lint do
+      Actions.sh("cd .. && pod lib lint && cd fastlane")
+  end
+  
+  desc "Lint"
+  lane :lint do
+      carthage_lint
+      pod_lint
+  end
+  
   desc "Release new version"
   desc "Release new version"
   lane :release do |options|
   lane :release do |options|
       target_version = options[:version]
       target_version = options[:version]