Enhancement/swift5 (#7)

* update example project, and use swift 5 on it. * use xcode 11 on travis * update readme * update test device and readme. * iPhone Xʀ with ios13 cant be found in travis ci, stick back with iphone X. ios 11.3
michaelhenry · Sep 28, 2019 · 2b3b8f0 · 2b3b8f0
1 parent e36c85c
commit 2b3b8f0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode10.2
+osx_image: xcode11
 language: objective-c
 jobs:
   include:
@@ -7,7 +7,7 @@ jobs:
         - gem install cocoapods
       script:
         - pod install
-        - xcodebuild test -workspace Example.xcworkspace -scheme Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' -quiet
+        - xcodebuild test -workspace Example.xcworkspace -scheme Example -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=11.3,name=iPhone X' -quiet
     - stage: deploying to cocoapods
       before_install:
         - echo $TRAVIS_TAG

diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj
@@ -3,10 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		30EDD2969B3DE74CC65DCB99 /* Pods_ExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0009A51296D447FCA409E2C0 /* Pods_ExampleTests.framework */; };
 		7DEC628F12E708B596AAFDEF /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ACF1A863AEE87E79B7132901 /* Pods_Example.framework */; };
 		A6C578FA227DEAAF00D720DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C578F9227DEAAF00D720DD /* AppDelegate.swift */; };
 		A6C578FC227DEAAF00D720DD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C578FB227DEAAF00D720DD /* ViewController.swift */; };
@@ -64,6 +65,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				30EDD2969B3DE74CC65DCB99 /* Pods_ExampleTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -191,9 +193,11 @@
 				TargetAttributes = {
 					A6C578F5227DEAAF00D720DD = {
 						CreatedOnToolsVersion = 10.1;
+						LastSwiftMigration = 1100;
 					};
 					A6C57909227DEAB400D720DD = {
 						CreatedOnToolsVersion = 10.1;
+						LastSwiftMigration = 1100;
 						TestTargetID = A6C578F5227DEAAF00D720DD;
 					};
 				};
@@ -244,16 +248,11 @@
 			files = (
 			);
 			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/MHWebViewController/MHWebViewController.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MHWebViewController.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -412,6 +411,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -466,6 +466,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -485,7 +486,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = net.iamkel.MHWebViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -505,7 +506,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = net.iamkel.MHWebViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -526,7 +527,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = net.iamkel.MHWebViewControllerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};
@@ -548,7 +549,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = net.iamkel.MHWebViewControllerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};

diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -25,7 +25,7 @@ class ViewController: UIViewController {
   }
 
   @objc func showBrowser(_ sender:UIButton) {
-    present(url: URL(string: "https://iamkel.net")!, completion: nil)
+    present(url: URL(string: "https://github.com")!, completion: nil)
   }
 }
 
diff --git a/README.md b/README.md
@@ -1,5 +1,10 @@
 # MHWebViewController
 
+
+[![CICD Status](https://img.shields.io/travis/michaelhenry/MHWebViewController.svg?style=flat)](https://travis-ci.org/michaelhenry/MHWebViewController) [![Version](https://img.shields.io/cocoapods/v/MHWebViewController.svg?style=flat)](http://cocoapods.org/pods/MHWebViewController) [![Platform](https://img.shields.io/cocoapods/p/MHWebViewController.svg?style=flat)](http://cocoapods.org/pods/MHWebViewController) [![License](https://img.shields.io/cocoapods/l/MHWebViewController.svg?style=flat)](http://cocoapods.org/pods/MHWebViewController) <a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift-5-4BC51D.svg?style=flat" alt="Language: Swift" /></a>
+
+![mhwebvc.gif](mhwebvc.gif)
+
 An Instagram inspired Web View Controller.
 
 ## How to Install

diff --git a/mhwebvc.gif b/mhwebvc.gif