Merge branch 'develop'

Author: jessesquires

.codecov.yml

@@ -6,27 +6,26 @@ coverage:
  round: nearest
  range: "60...100"
  ignore:
- - Tests/*
-
-status:
- project:
- default:
- target: auto
- threshold: 2.0
- branches: 
- - master
- - develop
+ - Tests/*
 
+ status:
+ project:
+ default:
+ target: auto
+ threshold: 2.0
+ branches:
+ - master
+ - develop
  patch:
  default:
  target: auto
  branches:
- - master
- - develop
- 
+  - master
+  - develop
+
 comment:
- layout: "header, diff, changes, sunburst, uncovered"
- branches: 
- - master
- - develop
+ layout: header, diff, changes, sunburst, uncovered
  behavior: default
+ branches:
+ - master
+ - develop

.travis.yml

@@ -1,31 +1,34 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
 
 env:
  global:
  - LANG=en_US.UTF-8
 
  - PROJECT="JSQWebViewController.xcodeproj"
  - IOS_SCHEME="JSQWebViewController"
- - IOS_SDK=iphonesimulator9.3
+
+ - IOS_SDK=iphonesimulator10.0
 
  matrix:
- - DESTINATION="OS=8.1,name=iPhone 4s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" RUN_UI_TESTS="NO"
- - DESTINATION="OS=8.2,name=iPhone 5" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=8.3,name=iPhone 5s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=8.4,name=iPhone 6" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
-
- - DESTINATION="OS=9.0,name=iPhone 5s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="YES"
- - DESTINATION="OS=9.1,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=9.2,name=iPhone 6 Plus" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=9.3,name=iPhone 6s Plus" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
-
- - DESTINATION="OS=8.1,name=iPad 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=8.4,name=iPad 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=9.0,name=iPad Retina" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=9.1,name=iPad Air" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=9.2,name=iPad Air 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
- - DESTINATION="OS=9.3,name=iPad Pro" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=8.1,name=iPhone 4s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=8.2,name=iPhone 5" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=8.3,name=iPhone 5s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=8.4,name=iPhone 6" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+
+ # - DESTINATION="OS=9.0,name=iPhone 5s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="YES"
+ # - DESTINATION="OS=9.1,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=9.2,name=iPhone 6 Plus" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=9.3,name=iPhone 6s Plus" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+
+ # - DESTINATION="OS=8.1,name=iPad 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=8.4,name=iPad 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=9.0,name=iPad Retina" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=9.1,name=iPad Air" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=9.2,name=iPad Air 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO"
+ # - DESTINATION="OS=9.3,name=iPad Pro" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="NO"
+
+ - DESTINATION="OS=10.0,name=iPhone 6s Plus" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
 
 script:
 
@@ -53,9 +56,9 @@ script:
 
 
 # Build for reporting test coverage
-- if [ $RUN_TESTS == "YES" ]; then
- xcodebuild test -project JSQWebViewController.xcodeproj -scheme "JSQWebViewController" -sdk iphonesimulator;
- fi
+# - if [ $RUN_TESTS == "YES" ]; then
+#  xcodebuild test -project JSQWebViewController.xcodeproj -scheme "JSQWebViewController" -sdk iphonesimulator;
+#  fi
 
 after_success:
 - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -4,6 +4,11 @@ The changelog for `JSQWebViewController`. Also see the [releases](https://github
 
 --------------------------------------
 
+4.0.0
+-----
+
+**Swift 2.3 now required.**
+
 3.0.0
 -----
 
@@ -30,4 +35,4 @@ Closes the [2.0.0 milestone](https://github.com/jessesquires/JSQWebViewControlle
 1.0.0
 -----
 
-:tada: Initial release :tada: 
+:tada: Initial release :tada:

Example/Example.xcodeproj/project.pbxproj

@@ -160,15 +160,17 @@
 88AEBB561BADF8C500923E82 /* Project object */ = {
 isa = PBXProject;
 attributes = {
-LastUpgradeCheck = 0700;
+LastUpgradeCheck = 0800;
 ORGANIZATIONNAME = "Hexed Bits";
 TargetAttributes = {
 886487F01BCADBED00671052 = {
 CreatedOnToolsVersion = 7.0.1;
+LastSwiftMigration = 0800;
 TestTargetID = 88AEBB5D1BADF8C500923E82;
 };
 88AEBB5D1BADF8C500923E82 = {
 CreatedOnToolsVersion = 7.0;
+LastSwiftMigration = 0800;
 };
 };
 };
@@ -267,6 +269,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.ExampleUITests;
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 2.3;
 TEST_TARGET_NAME = Example;
 USES_XCTRUNNER = YES;
 };
@@ -280,6 +283,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.ExampleUITests;
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 2.3;
 TEST_TARGET_NAME = Example;
 USES_XCTRUNNER = YES;
 };
@@ -298,8 +302,10 @@
 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 CLANG_WARN_EMPTY_BODY = YES;
 CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+CLANG_WARN_SUSPICIOUS_MOVE = YES;
 CLANG_WARN_UNREACHABLE_CODE = YES;
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -343,8 +349,10 @@
 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 CLANG_WARN_EMPTY_BODY = YES;
 CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+CLANG_WARN_SUSPICIOUS_MOVE = YES;
 CLANG_WARN_UNREACHABLE_CODE = YES;
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -363,6 +371,7 @@
 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 MTL_ENABLE_DEBUG_INFO = NO;
 SDKROOT = iphoneos;
+SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 TARGETED_DEVICE_FAMILY = "1,2";
 VALIDATE_PRODUCT = YES;
 };
@@ -376,6 +385,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.Example;
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 2.3;
 };
 name = Debug;
 };
@@ -387,6 +397,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.Example;
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 2.3;
 };
 name = Release;
 };

Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

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

JSQWebViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'JSQWebViewController'
- s.version = '3.0.0'
+ s.version = '4.0.0'
  s.license = 'MIT'
 
  s.summary = 'A lightweight Swift WebKit view controller for iOS'

JSQWebViewController.xcodeproj/project.pbxproj

@@ -146,11 +146,12 @@
 isa = PBXProject;
 attributes = {
 LastSwiftUpdateCheck = 0700;
-LastUpgradeCheck = 0700;
+LastUpgradeCheck = 0800;
 ORGANIZATIONNAME = "Hexed Bits";
 TargetAttributes = {
 88AEBB071BADF48300923E82 = {
 CreatedOnToolsVersion = 7.0;
+LastSwiftMigration = 0800;
 };
 88AEBB111BADF48300923E82 = {
 CreatedOnToolsVersion = 7.0;
@@ -233,8 +234,10 @@
 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 CLANG_WARN_EMPTY_BODY = YES;
 CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+CLANG_WARN_SUSPICIOUS_MOVE = YES;
 CLANG_WARN_UNREACHABLE_CODE = YES;
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -262,6 +265,7 @@
 ONLY_ACTIVE_ARCH = YES;
 SDKROOT = iphoneos;
 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+SWIFT_VERSION = 2.3;
 TARGETED_DEVICE_FAMILY = "1,2";
 VERSIONING_SYSTEM = "apple-generic";
 VERSION_INFO_PREFIX = "";
@@ -281,8 +285,10 @@
 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 CLANG_WARN_EMPTY_BODY = YES;
 CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+CLANG_WARN_SUSPICIOUS_MOVE = YES;
 CLANG_WARN_UNREACHABLE_CODE = YES;
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -302,6 +308,8 @@
 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 MTL_ENABLE_DEBUG_INFO = NO;
 SDKROOT = iphoneos;
+SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+SWIFT_VERSION = 2.3;
 TARGETED_DEVICE_FAMILY = "1,2";
 VALIDATE_PRODUCT = YES;
 VERSIONING_SYSTEM = "apple-generic";
@@ -313,6 +321,7 @@
 isa = XCBuildConfiguration;
 buildSettings = {
 CLANG_ENABLE_MODULES = YES;
+"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 DEFINES_MODULE = YES;
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = 1;
@@ -325,13 +334,15 @@
 PRODUCT_NAME = "$(TARGET_NAME)";
 SKIP_INSTALL = YES;
 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+SWIFT_VERSION = 2.3;
 };
 name = Debug;
 };
 88AEBB1E1BADF48300923E82 /* Release */ = {
 isa = XCBuildConfiguration;
 buildSettings = {
 CLANG_ENABLE_MODULES = YES;
+"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 DEFINES_MODULE = YES;
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = 1;
@@ -343,6 +354,7 @@
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.JSQWebViewController;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SKIP_INSTALL = YES;
+SWIFT_VERSION = 2.3;
 };
 name = Release;
 };
@@ -353,6 +365,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.JSQWebViewControllerTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 2.3;
 };
 name = Debug;
 };
@@ -363,6 +376,7 @@
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = com.hexedbits.JSQWebViewControllerTests;
 PRODUCT_NAME = "$(TARGET_NAME)";
+SWIFT_VERSION = 2.3;
 };
 name = Release;
 };

JSQWebViewController.xcodeproj/xcshareddata/xcschemes/JSQWebViewController.xcscheme

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

Source/Info.plist

@@ -15,7 +15,7 @@
 <key>CFBundlePackageType</key>
 <string>FMWK</string>
 <key>CFBundleShortVersionString</key>
-<string>3.0.0</string>
+<string>4.0.0</string>
 <key>CFBundleSignature</key>
 <string>????</string>
 <key>CFBundleVersion</key>