Merge pull request #166 from Orderella/Swift4

Swift 4 compatibility

.hound.yml

@@ -0,0 +1,2 @@
+swift:
+  config_file: Example/.swiftlint.yml

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.travis.yml

@@ -1,18 +1,18 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode9
 env:
   global:
   - WORKSPACE=Example/PopupDialog.xcworkspace
   - IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
-  - IOS_SDK=iphonesimulator10.2
+  - IOS_SDK=iphonesimulator11.0
   - EXAMPLE_SCHEME="PopupDialog-Example"
   matrix:
-    - DESTINATION="OS=10.1,name=iPhone 7 Plus"  SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
-    - DESTINATION="OS=10.1,name=iPhone 6"       SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=iPhone 5"        SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
+    - DESTINATION="OS=11.0,name=iPhone 7 Plus"  SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
+    - DESTINATION="OS=10.2,name=iPhone 6"       SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.2,name=iPhone 5s"       SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"  RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
 before_install:
-  - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
-  - pod install --project-directory=./Example
+  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+  - pod install --project-directory=./Example --repo-update
 script:
   - set -o pipefail
   - xcodebuild -version

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* **0.6.0** Swift 4 support<br>Dropped iOS8 compatibility
 * **0.5.4** Fixed bug where blur view would reveal hidden layer<br>Improved view controller lifecycle handling<br>Scroll views can now be used with gesture dismissal
 * **0.5.3** Fixed memory leak with custom view controllers<br>Added UI automation & snapshot tests
 * **0.5.2** Fixed image scaling for default view 
@@ -19,4 +20,4 @@
 * **0.1.3** Big screen support<br>Exposed basic shadow appearance
 * **0.1.2** Exposed blur and overlay appearance
 * **0.1.1** Added themeing example
-* **0.1.0** Intitial version
+* **0.1.0** Intitial version

Example/.swiftlint.yml

@@ -0,0 +1,50 @@
+
+included:
+  - ../PopupDialog
+
+excluded:
+  - Carthage
+  - Pods
+  - External
+
+disabled_rules:
+  - line_length
+  - type_name
+  - todo
+  - valid_docs
+  - conditional_binding_cascade
+  - trailing_newline
+  - trailing_whitespace
+
+opt_in_rules:
+  - empty_count
+  - force_unwrapping
+
+force_cast: warning
+
+vertical_whitespace:
+  max_empty_lines: 2
+
+function_parameter_count:
+  - 6 #warning
+  - 8 #error
+
+cyclomatic_complexity:
+  - 20 #warning
+  - 35 #error
+
+file_length:
+  - 400 #warning
+  - 600 #error
+
+function_body_length:
+  - 40 #warning
+  - 80 #error
+
+line_length:
+  - 300 #warning
+  - 350 #error
+
+type_body_length:
+  - 400 #warning
+  - 500 #error

Example/Podfile

@@ -1,11 +1,16 @@
+platform :ios, '9.0'
 use_frameworks!
 
 target 'PopupDialog_Example' do
+
   pod 'PopupDialog', :path => '../'
+  pod 'SwiftLint', '~> 0.22'
 
   target 'PopupDialog_Tests' do
     inherit! :search_paths
-    pod 'Nimble', '~> 5.0.0'
-    pod 'FBSnapshotTestCase'
+
+    pod 'Nimble', '~> 7.0.2'
+    pod 'FBSnapshotTestCase', :git => 'https://github.com/facebook/ios-snapshot-test-case.git', :commit => 'ed4e6a6'
+
   end
 end

Example/Podfile.lock

@@ -4,23 +4,34 @@ PODS:
   - FBSnapshotTestCase/Core (2.1.4)
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
-  - Nimble (5.0.0)
-  - PopupDialog (0.5.3)
+  - Nimble (7.0.2)
+  - PopupDialog (0.6.0)
+  - SwiftLint (0.22.0)
 
 DEPENDENCIES:
-  - FBSnapshotTestCase
-  - Nimble (~> 5.0.0)
+  - FBSnapshotTestCase (from `https://github.com/facebook/ios-snapshot-test-case.git`, commit `ed4e6a6`)
+  - Nimble (~> 7.0.2)
   - PopupDialog (from `../`)
+  - SwiftLint (~> 0.22)
 
 EXTERNAL SOURCES:
+  FBSnapshotTestCase:
+    :commit: ed4e6a6
+    :git: https://github.com/facebook/ios-snapshot-test-case.git
   PopupDialog:
-    :path: "../"
+    :path: ../
+
+CHECKOUT OPTIONS:
+  FBSnapshotTestCase:
+    :commit: ed4e6a6
+    :git: https://github.com/facebook/ios-snapshot-test-case.git
 
 SPEC CHECKSUMS:
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
-  PopupDialog: 556684104977055f8b3c2752890b26cf3de4def4
+  Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
+  PopupDialog: 6382b868ea57e78032725d54a4dfbc57d27f7281
+  SwiftLint: 1134786caedd2caab0560d2f36b76414a5a56808
 
-PODFILE CHECKSUM: 3c0cdc96cf5fd9c2cbd806911d57125400e632f7
+PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.3.1