0411 更新 pod 库

News/News.xcodeproj/project.pbxproj

@@ -1122,7 +1122,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = hrscy;
 				TargetAttributes = {
 					942DCF071F6010E1001AD160 = {
@@ -1138,12 +1138,14 @@
 					942DCF1B1F6010E1001AD160 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = CK4C7KZJ97;
+						LastSwiftMigration = 0930;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 942DCF071F6010E1001AD160;
 					};
 					942DCF261F6010E1001AD160 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = CK4C7KZJ97;
+						LastSwiftMigration = 0930;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 942DCF071F6010E1001AD160;
 					};
@@ -1558,13 +1560,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1613,13 +1617,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1698,7 +1704,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.hrscy.NewsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/News.app/News";
 			};
 			name = Debug;
@@ -1713,7 +1720,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.hrscy.NewsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/News.app/News";
 			};
 			name = Release;
@@ -1727,7 +1735,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.hrscy.NewsUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = News;
 			};
 			name = Debug;
@@ -1741,7 +1750,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.hrscy.NewsUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = News;
 			};
 			name = Release;

News/News/Classes/Home/Controller/HomeViewController.swift

@@ -143,7 +143,7 @@ extension HomeViewController {
 extension HomeViewController: SGPageTitleViewDelegate, SGPageContentViewDelegate {
     /// 联动 pageContent 的方法
     func pageTitleView(_ pageTitleView: SGPageTitleView!, selectedIndex: Int) {
-        self.pageContentView!.setPageCententViewCurrentIndex(selectedIndex)
+        self.pageContentView!.setPageContentViewCurrentIndex(selectedIndex)
     }
 
     /// 联动 SGPageTitleView 的方法

News/News/Classes/Huoshan/Controller/HuoshanViewController.swift

@@ -51,7 +51,7 @@ extension HuoshanViewController {
 
         // 点击了 标题
         navigationBar.pageTitleViewSelected = { [weak self] in
-            self!.pageContentView!.setPageCententViewCurrentIndex($0)
+            self!.pageContentView!.setPageContentViewCurrentIndex($0)
         }
     }
 

News/News/Classes/Main/Controller/MyTabBarController.swift

@@ -94,8 +94,7 @@ class MyTabBarController: UITabBarController {
         }
         childController.title = title
         // 添加导航控制器为 TabBarController 的子控制器
-        let navVc = MyNavigationController(rootViewController: childController)
-        addChildViewController(navVc)
+        addChildViewController(MyNavigationController(rootViewController: childController))
     }
 
     deinit {

News/News/Classes/Mine/View/NoLoginHeaderView.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

News/News/Classes/Video/Controller/VideoViewController.swift

@@ -81,7 +81,7 @@ extension VideoViewController {
 extension VideoViewController: SGPageTitleViewDelegate, SGPageContentViewDelegate {
     /// 联动 pageContent 的方法
     func pageTitleView(_ pageTitleView: SGPageTitleView!, selectedIndex: Int) {
-        self.pageContentView!.setPageCententViewCurrentIndex(selectedIndex)
+        self.pageContentView!.setPageContentViewCurrentIndex(selectedIndex)
     }
 
     /// 联动 SGPageTitleView 的方法

News/Podfile

@@ -7,7 +7,7 @@ target 'News' do
 
   pod 'Alamofire'
   pod 'SwiftyJSON'
-  pod 'HandyJSON', '~>4.0.0-beta.1'
+  pod 'HandyJSON', '~> 4.1.1'
   pod 'Kingfisher'
   pod 'IBAnimatable'
   pod 'SwiftTheme'

News/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Alamofire (4.6.0)
+  - Alamofire (4.7.1)
   - BMPlayer (1.0.1):
     - BMPlayer/Full (= 1.0.1)
   - BMPlayer/Core (1.0.1)
@@ -8,31 +8,31 @@ PODS:
     - NVActivityIndicatorView (~> 4.0.0)
     - SnapKit (~> 4.0.0)
   - FDFullscreenPopGesture (1.1)
-  - HandyJSON (4.0.0-beta.1)
+  - HandyJSON (4.1.1)
   - IBAnimatable (5.0.0)
-  - Kingfisher (4.6.1)
-  - lottie-ios (2.1.5)
-  - MJRefresh (3.1.15.1)
+  - Kingfisher (4.7.0)
+  - lottie-ios (2.5.0)
+  - MJRefresh (3.1.15.3)
   - NVActivityIndicatorView (4.0.1):
     - NVActivityIndicatorView/Presenter (= 4.0.1)
   - NVActivityIndicatorView/Presenter (4.0.1)
-  - RxCocoa (4.1.1):
+  - RxCocoa (4.1.2):
     - RxSwift (~> 4.0)
-  - RxSwift (4.1.1)
-  - SGPagingView (1.3.5)
+  - RxSwift (4.1.2)
+  - SGPagingView (1.3.6)
   - SnapKit (4.0.0)
   - SQLite.swift (0.11.4):
     - SQLite.swift/standard (= 0.11.4)
   - SQLite.swift/standard (0.11.4)
-  - SVProgressHUD (2.2.2)
+  - SVProgressHUD (2.2.5)
   - SwiftTheme (0.4.1)
   - SwiftyJSON (4.0.0)
 
 DEPENDENCIES:
   - Alamofire
   - BMPlayer
   - FDFullscreenPopGesture
-  - HandyJSON (~> 4.0.0-beta.1)
+  - HandyJSON (~> 4.1.1)
   - IBAnimatable
   - Kingfisher
   - lottie-ios
@@ -46,24 +46,24 @@ DEPENDENCIES:
   - SwiftyJSON
 
 SPEC CHECKSUMS:
-  Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
+  Alamofire: 68d7d521118d49c615a8d2214d87cdf525599d30
   BMPlayer: 44eebf06eb01450dd14ea74b27d07c5222f0eed1
   FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
-  HandyJSON: 428bb18e2c34c2a77361accebf90cf64e4f74118
+  HandyJSON: 3a3de917c4118767ffe41c29b5acba23409649f4
   IBAnimatable: aa2286a9cf8fb4ae2e1be85c5287ae56143b024f
-  Kingfisher: 1f9157d9c02b380cbd0b7cc890161195164eb634
-  lottie-ios: 836cdbba92f62f3c6a00e37a4ce485321fe317cf
-  MJRefresh: 5f8552bc25ca8751c010f621c1098dbdaacbccd6
+  Kingfisher: da6b005aa96d37698e3e4f1ccfe96a5b9bbf27d6
+  lottie-ios: d699fdee68d7b63e721d949388b015fef1aaa4ac
+  MJRefresh: b48380ae2b927b46c4ef000de9adb8dc748e1df7
   NVActivityIndicatorView: 77ed6d7b571643e24899e7858bf9ae2ee4c21f31
-  RxCocoa: fd0862fd2df95fa55562ad28ffd2522c25eb4a85
-  RxSwift: c6e3b1c7b325c7d121cd4327e9d98b7ed746b570
-  SGPagingView: b001e3c761386ac6f33be9ff073bcf250b394874
+  RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a
+  RxSwift: e49536837d9901277638493ea537394d4b55f570
+  SGPagingView: 4e9204cc62e4b63b269fbf48b4e8c9333adcd071
   SnapKit: a42d492c16e80209130a3379f73596c3454b7694
   SQLite.swift: 3e3bee21da701b5b9f87c4a672cb54f233505692
-  SVProgressHUD: 59b2d3dabacbd051576d21d32293ca7228dc18b0
+  SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftTheme: 36d71c4eed4b2c401c782cf036e4586c749a8173
   SwiftyJSON: 070dabdcb1beb81b247c65ffa3a79dbbfb3b48aa
 
-PODFILE CHECKSUM: 64ae2a22acd8a7d014ecc833c553f61e4bdd7185
+PODFILE CHECKSUM: efac193b2b9675dbb674415cb571da4c2e67f8cf
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0