Merge branch 'master' into landscapeWidth

* master:
  Swift 5 support (Orderella#310)
  Simplified CI test runs
  Pod update
  Version bump
  Added iPhone XR snapshot reference images
  Switched to ios-snapshot-test-case
  Disabled appearance tests
  Pod update
  Version bump
  Added iPhone XR test run
  Added iPhone XR 12.1 snapshot reference images
  Ignore failure diffs
  - explicitly set used swift version to 4.2

# Conflicts:
#	Example/Podfile.lock
#	Example/Pods/Manifest.lock
#	Example/Pods/Pods.xcodeproj/project.pbxproj
#	Example/Pods/Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase.xcconfig
#	Example/Pods/Target Support Files/Pods-PopupDialog_Tests/Pods-PopupDialog_Tests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-PopupDialog_Tests/Pods-PopupDialog_Tests.release.xcconfig
#	Example/PopupDialog.xcodeproj/project.pbxproj

.gitignore

@@ -33,3 +33,4 @@ DerivedData
 #
 # Pods/
 .idea
+/Tests/FailureDiffs

.swift-version

@@ -1 +1 @@
-4.2
+5

.travis.yml

@@ -1,19 +1,17 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 env:
   global:
     - WORKSPACE=Example/PopupDialog.xcworkspace
     - IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
-    - IOS_SDK=iphonesimulator12.0
-    - EXAMPLE_SCHEME="PopupDialog-Example"
+    - IOS_SDK=iphonesimulator12.2
   matrix:
-    - DESTINATION="OS=11.1,name=iPhone 7 Plus" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-7-Plus, 11.1" SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
-    - DESTINATION="OS=10.2,name=iPhone 6"      SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-6, 10.2"      SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=iPhone 5s"      SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-5s, 9.2"      SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.1,name=iPad Air 2"    SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPad-Air-2, 11.1"    SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
+    - DESTINATION="OS=12.2,name=iPhone Xʀ"  SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-Xʀ, 12.2"  SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK" POD_LINT="YES"
+    - DESTINATION="OS=10.2,name=iPhone 6"   SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-6, 10.2"   SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK" POD_LINT="NO"
+    - DESTINATION="OS=11.1,name=iPad Air 2" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPad-Air-2, 11.1" SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK" POD_LINT="NO"
 before_install:
   - npm install ios-sim -g
-  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+  - gem install cocoapods --no-document --quiet
   - pod install --project-directory=./Example --repo-update
 script:
   - set -o pipefail
@@ -22,26 +20,10 @@ script:
   - xcrun simctl list
 
   # "Prewarm" simulators as of https://github.com/travis-ci/travis-ci/issues/6675
-  - ios-sim start --devicetypeid "$SIMNAME"
+  # - ios-sim start --devicetypeid "$SIMNAME"
 
-  # Build Framework in Debug and Run Tests if specified
-  - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
-    else
-      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-    fi
-
-  # Build Framework in Release and Run Tests if specified
-  - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
-    else
-      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-    fi
-
-  # Build Example in Debug if specified
-  - if [ $BUILD_EXAMPLE == "YES" ]; then
-      xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-    fi
+  # Build Framework in Debug and run tests
+  - xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
 
   # Run `pod lib lint` if specified
   - if [ $POD_LINT == "YES" ]; then

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
-
+* **1.1.0** Swift 5 support
+* **1.0.0** Pinned Swift version to 4.2<br>Dropped iOS 9 support as of moving to ios-snapshot-test-case
 * **0.9.2** Fixes crash when presenting dialog while app is inactive
 * **0.9.1** Fixes Carthage support
 * **0.9.0** Swift 4.2 support

Example/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '9.0'
+platform :ios, '10.0'
 use_frameworks!
 
 ENV['COCOAPODS_DISABLE_STATS'] = "true" ## This disabled the Sending Stats when running Pod install in terminal
@@ -12,7 +12,7 @@ target 'PopupDialog_Example' do
     inherit! :search_paths
 
     pod 'Nimble', '~> 7.3.1'
-    pod 'FBSnapshotTestCase', '~> 2.1.4'
+    pod 'iOSSnapshotTestCase', '~> 6.0.2'
 
   end
 end

Example/Podfile.lock

@@ -1,25 +1,25 @@
 PODS:
   - DynamicBlurView (3.0.1)
-  - FBSnapshotTestCase (2.1.4):
-    - FBSnapshotTestCase/SwiftSupport (= 2.1.4)
-  - FBSnapshotTestCase/Core (2.1.4)
-  - FBSnapshotTestCase/SwiftSupport (2.1.4):
-    - FBSnapshotTestCase/Core
-  - Nimble (7.3.1)
-  - PopupDialog (0.9.2):
+  - iOSSnapshotTestCase (6.0.2):
+    - iOSSnapshotTestCase/SwiftSupport (= 6.0.2)
+  - iOSSnapshotTestCase/Core (6.0.2)
+  - iOSSnapshotTestCase/SwiftSupport (6.0.2):
+    - iOSSnapshotTestCase/Core
+  - Nimble (7.3.4)
+  - PopupDialog (1.1.0):
     - DynamicBlurView (~> 3.0.1)
-  - SwiftLint (0.29.1)
+  - SwiftLint (0.31.0)
 
 DEPENDENCIES:
-  - FBSnapshotTestCase (~> 2.1.4)
+  - iOSSnapshotTestCase (~> 6.0.2)
   - Nimble (~> 7.3.1)
   - PopupDialog (from `../`)
   - SwiftLint (~> 0.22)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - DynamicBlurView
-    - FBSnapshotTestCase
+    - iOSSnapshotTestCase
     - Nimble
     - SwiftLint
 
@@ -29,11 +29,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
-  FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
-  PopupDialog: f4bb461bf70ff422be0b56656566424ee9273080
-  SwiftLint: 6772320e40b52049053a518c17db9b0634a0b45a
+  iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
+  Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
+  PopupDialog: 42fb7a0bc4fafdf89fef8b5b2b127a6023f3e1cc
+  SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
 
-PODFILE CHECKSUM: 2d0166d1e20a1e39377fb316142d39a3785d58f2
+PODFILE CHECKSUM: 745b14824f525113e600d7bfeeb81d4a978d6f28
 
-COCOAPODS: 1.7.2
+COCOAPODS: 1.6.1