fix conflict

BMPlayer.podspec

@@ -14,9 +14,9 @@ s.author           = { "Eliyar Eziz" => "[email protected]" }
 s.source           = { :git => "https://github.com/BrikerMan/BMPlayer.git", :tag => s.version.to_s }
 s.social_media_url = 'http://weibo.com/536445669'
 
-s.ios.deployment_target = '8.0'
-s.platform     = :ios, '8.0'
-s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
+s.ios.deployment_target = '10.0'
+s.platform     = :ios, '10.0'
+s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
 s.default_subspec = 'Full'
 
 s.subspec 'Core' do |core|
@@ -30,12 +30,8 @@ s.subspec 'Full' do |full|
     full.frameworks   = 'UIKit', 'AVFoundation'
 
     full.dependency 'BMPlayer/Core'
-    full.dependency 'SnapKit', '~> 4.2.0'
-<<<<<<< HEAD
-    full.dependency 'NVActivityIndicatorView', '~> 4.4.0'
-=======
-    full.dependency 'NVActivityIndicatorView', '~> 4.6.1'
->>>>>>> BrikerMan/master
+    full.dependency 'SnapKit', '~> 5.0.0'
+    full.dependency 'NVActivityIndicatorView', '~> 4.7.0'
 end
 
 s.subspec 'CacheSupport' do |cache|
@@ -44,12 +40,8 @@ s.subspec 'CacheSupport' do |cache|
     cache.frameworks   = 'UIKit', 'AVFoundation'
 
     cache.dependency 'BMPlayer/Core'
-    cache.dependency 'SnapKit', '~> 4.2.0'
-<<<<<<< HEAD
-    cache.dependency 'NVActivityIndicatorView', '~> 4.4.0'
-=======
-    cache.dependency 'NVActivityIndicatorView', '~> 4.6.1'
->>>>>>> BrikerMan/master
+    cache.dependency 'SnapKit', '~> 5.0.0'
+    cache.dependency 'NVActivityIndicatorView', '~> 4.7.0'
     cache.dependency 'VIMediaCache'
 end
 

Example/BMPlayer.xcodeproj/project.pbxproj

@@ -210,7 +210,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -220,7 +220,7 @@
 					};
 					6AAA77071CE18427009745BA = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -229,6 +229,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -275,11 +276,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-BMPlayer_Example/Pods-BMPlayer_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/BMPlayer/BMPlayer.framework",
 				"${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework",
-<<<<<<< HEAD
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-18/iOS/RevealServer.framework",
-=======
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-20/iOS/RevealServer.framework",
->>>>>>> BrikerMan/master
+				"${PODS_ROOT}/Reveal-SDK/RevealServer-22/iOS/RevealServer.framework",
 				"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SwipeBack/SwipeBack.framework",
 				"${BUILT_PRODUCTS_DIR}/VIMediaCache/VIMediaCache.framework",
@@ -367,6 +364,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -410,7 +408,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -423,6 +421,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -459,7 +458,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -478,13 +477,13 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = BMPlayer/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.BMPlayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -498,13 +497,13 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = BMPlayer/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.BMPlayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -519,7 +518,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.eliyar.BMPlayer-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -533,7 +532,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.eliyar.BMPlayer-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Example/BMPlayer.xcodeproj/xcshareddata/xcschemes/BMPlayer-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Podfile

@@ -11,7 +11,7 @@ end
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '4.2'
+            config.build_settings['SWIFT_VERSION'] = '5.0'
         end
     end
 end

Example/Podfile.lock

@@ -1,30 +1,17 @@
 PODS:
-<<<<<<< HEAD
-  - BMPlayer/CacheSupport (1.0.2):
+  - BMPlayer/CacheSupport (1.2.1):
     - BMPlayer/Core
-    - NVActivityIndicatorView (~> 4.4.0)
-    - SnapKit (~> 4.2.0)
+    - NVActivityIndicatorView (~> 4.7.0)
+    - SnapKit (~> 5.0.0)
     - VIMediaCache
-  - BMPlayer/Core (1.0.2)
-  - NVActivityIndicatorView (4.4.0):
-    - NVActivityIndicatorView/Presenter (= 4.4.0)
-  - NVActivityIndicatorView/Presenter (4.4.0)
-  - Reveal-SDK (18)
-=======
-  - BMPlayer/CacheSupport (1.2.0):
-    - BMPlayer/Core
-    - NVActivityIndicatorView (~> 4.6.1)
-    - SnapKit (~> 4.2.0)
-    - VIMediaCache
-  - BMPlayer/Core (1.2.0)
-  - NVActivityIndicatorView (4.6.1):
-    - NVActivityIndicatorView/Presenter (= 4.6.1)
-  - NVActivityIndicatorView/Presenter (4.6.1)
-  - Reveal-SDK (20)
->>>>>>> BrikerMan/master
-  - SnapKit (4.2.0)
+  - BMPlayer/Core (1.2.1)
+  - NVActivityIndicatorView (4.7.0):
+    - NVActivityIndicatorView/Presenter (= 4.7.0)
+  - NVActivityIndicatorView/Presenter (4.7.0)
+  - Reveal-SDK (22)
+  - SnapKit (5.0.0)
   - SwipeBack (1.1.1)
-  - VIMediaCache (0.3)
+  - VIMediaCache (0.4)
 
 DEPENDENCIES:
   - BMPlayer/CacheSupport (from `../`)
@@ -44,23 +31,13 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-<<<<<<< HEAD
-  BMPlayer: ad7a93fd9daa13678bd2bf3fcab221e4f3d07bb1
-  NVActivityIndicatorView: ec7440a57af2450319d3a4181cca7da6fc127064
-  Reveal-SDK: cce79388da3fd0bbb6ae19d769b906cfc3a33a89
-=======
-  BMPlayer: 7e279b69b4bc90aaf4150f86b042a5896206ee62
-  NVActivityIndicatorView: 4ca19fccc84595a78957336a086d00a49be6ce61
-  Reveal-SDK: 43206a57f575632fd304e85385cc259b5d359e32
->>>>>>> BrikerMan/master
-  SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
+  BMPlayer: ea61ce7332a6a9c9f1287598b0838e5c91952c29
+  NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea
+  Reveal-SDK: 1385ab77aa15e9a3e21f798c74bd8e94cb54c651
+  SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
   SwipeBack: d6759601b40da1f4161033feb30ab475d7d04322
-  VIMediaCache: 02c03af2adf2526eddc8ee3b06e41f26e9546f38
+  VIMediaCache: aa650f82cb114c68a343beb4e67416cf5eb2f3a2
 
-PODFILE CHECKSUM: e6260ad2cccc640a9c4d2b9ffbcf0063728b772b
+PODFILE CHECKSUM: e66c01a79736fc724a4cc4cebeac12108b2b73e2
 
-<<<<<<< HEAD
-COCOAPODS: 1.5.3
-=======
-COCOAPODS: 1.6.0
->>>>>>> BrikerMan/master
+COCOAPODS: 1.6.1