Merge pull request #333 from Orderella/development

Swift 5 compatibility

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+* **1.1.1** Updates dependencies to Swift 5
 * **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

Example/Podfile

@@ -6,7 +6,7 @@ ENV['COCOAPODS_DISABLE_STATS'] = "true" ## This disabled the Sending Stats when
 target 'PopupDialog_Example' do
 
   pod 'PopupDialog', :path => '../'
-  pod 'SwiftLint', '~> 0.22'
+  pod 'SwiftLint', '~> 0.35'
 
   target 'PopupDialog_Tests' do
     inherit! :search_paths

Example/Podfile.lock

@@ -1,23 +1,23 @@
 PODS:
-  - DynamicBlurView (3.0.1)
-  - iOSSnapshotTestCase (6.0.2):
-    - iOSSnapshotTestCase/SwiftSupport (= 6.0.2)
-  - iOSSnapshotTestCase/Core (6.0.2)
-  - iOSSnapshotTestCase/SwiftSupport (6.0.2):
+  - DynamicBlurView (4.0.0)
+  - iOSSnapshotTestCase (6.0.3):
+    - iOSSnapshotTestCase/SwiftSupport (= 6.0.3)
+  - iOSSnapshotTestCase/Core (6.0.3)
+  - iOSSnapshotTestCase/SwiftSupport (6.0.3):
     - iOSSnapshotTestCase/Core
   - Nimble (7.3.4)
-  - PopupDialog (1.1.0):
-    - DynamicBlurView (~> 3.0.1)
-  - SwiftLint (0.31.0)
+  - PopupDialog (1.1.1):
+    - DynamicBlurView (~> 4.0)
+  - SwiftLint (0.35.0)
 
 DEPENDENCIES:
   - iOSSnapshotTestCase (~> 6.0.2)
   - Nimble (~> 7.3.1)
   - PopupDialog (from `../`)
-  - SwiftLint (~> 0.22)
+  - SwiftLint (~> 0.35)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - DynamicBlurView
     - iOSSnapshotTestCase
     - Nimble
@@ -28,12 +28,12 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
-  iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
+  DynamicBlurView: ccf9acd2b20c883cc2c72e3524a04d8d3ee20533
+  iOSSnapshotTestCase: 944a73f6d9676302811a86c0cf35f0e6ef5ab2a0
   Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
-  PopupDialog: 42fb7a0bc4fafdf89fef8b5b2b127a6023f3e1cc
-  SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
+  PopupDialog: 720c92befd8bc23c13442254945213db5612f149
+  SwiftLint: 5553187048b900c91aa03552807681bb6b027846
 
-PODFILE CHECKSUM: 745b14824f525113e600d7bfeeb81d4a978d6f28
+PODFILE CHECKSUM: 07c617a2f6b270e1e612e31d4f4d376badedc104
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.1

Example/PopupDialog.xcodeproj/project.pbxproj

@@ -309,7 +309,7 @@
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "PopupDialog" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -643,7 +643,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.PopupDialog-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -664,7 +664,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.PopupDialog-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";

PopupDialog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'PopupDialog'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'A simple custom popup dialog view controller'
   s.homepage         = 'https://github.com/orderella/PopupDialog'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '10.0'
   s.source_files = 'PopupDialog/Classes/**/*'
-  s.swift_version = '5'
+  s.swift_version = '5.0'
 
-  s.dependency 'DynamicBlurView', '~> 3.0.1'
+  s.dependency 'DynamicBlurView', '~> 4.0'
 end

README.md

@@ -446,6 +446,7 @@ Minimum requirement is iOS 10.0. This dialog was written with Swift 5, for suppo
 <p>&nbsp;</p>
 
 # Changelog
+* **1.1.1** Updates dependencies to Swift 5
 * **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