Merge pull request #209 from onevcat/fix/project-structure

Fix project structure

Kingfisher.podspec

@@ -31,15 +31,15 @@ Pod::Spec.new do |s|
 
   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.framework = "CFNetwork"

KingfisherTests-OSX/KingfisherTests_OSX.swift

@@ -1,35 +0,0 @@
-//
-//  KingfisherTests_OSX.swift
-//  KingfisherTests-OSX
-//
-//  Created by Wei Wang on 16/1/6.
-//  Copyright © 2016年 Wei Wang. All rights reserved.
-//
-
-import XCTest
-
-class KingfisherTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measureBlock {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}

KingfisherTests-tvOS/KingfisherTests_tvOS.swift

@@ -1,35 +0,0 @@
-//
-//  KingfisherTests_tvOS.swift
-//  KingfisherTests-tvOS
-//
-//  Created by WANG WEI on 2016/01/14.
-//  Copyright © 2016年 Wei Wang. All rights reserved.
-//
-
-import XCTest
-
-class KingfisherTeststvOS: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measureBlock {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}

fastlane/Fastfile

@@ -20,6 +20,17 @@ platform :ios do
       Actions.sh("cd .. && carthage build --no-skip-current && cd fastlane")
   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"
   lane :release do |options|
       target_version = options[:version]