Skip to content

Commit 9c6e8ef

Browse files
authored
Swift 5 support (#310)
* Swift 5.0 Warnings Removal Update @04042019 * Swift version bump * Version bump * Run Travis CI with Xcode 10.2 * Version bump * Updated README * Removed deprecated commands * Updated Swift and simulator version * Get device type ids from ios-sim * Disable prewarming for now * Changed iPhone version to Xʀ * Updated reference image names
1 parent 270bcf9 commit 9c6e8ef

42 files changed

Lines changed: 1367 additions & 1108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
language: objective-c
2-
osx_image: xcode10.1
2+
osx_image: xcode10.2
33
env:
44
global:
55
- WORKSPACE=Example/PopupDialog.xcworkspace
66
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
7-
- IOS_SDK=iphonesimulator12.1
7+
- IOS_SDK=iphonesimulator12.2
88
matrix:
9-
- DESTINATION="OS=12.1,name=iPhone XR" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-XR, 12.1" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" POD_LINT="YES"
9+
- 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"
1010
- 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"
1111
- 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"
1212
before_install:
1313
- npm install ios-sim -g
14-
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
14+
- gem install cocoapods --no-document --quiet
1515
- pod install --project-directory=./Example --repo-update
1616
script:
1717
- set -o pipefail
@@ -20,7 +20,7 @@ script:
2020
- xcrun simctl list
2121

2222
# "Prewarm" simulators as of https://github.com/travis-ci/travis-ci/issues/6675
23-
- ios-sim start --devicetypeid "$SIMNAME"
23+
# - ios-sim start --devicetypeid "$SIMNAME"
2424

2525
# Build Framework in Debug and run tests
2626
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changelog
2-
* **0.1.0** Pinned Swift version to 4.2<br>Dropped iOS 9 support as of moving to ios-snapshot-test-case
2+
* **1.1.0** Swift 5 support
3+
* **1.0.0** Pinned Swift version to 4.2<br>Dropped iOS 9 support as of moving to ios-snapshot-test-case
34
* **0.9.2** Fixes crash when presenting dialog while app is inactive
45
* **0.9.1** Fixes Carthage support
56
* **0.9.0** Swift 4.2 support

‎Example/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PODS:
66
- iOSSnapshotTestCase/SwiftSupport (6.0.2):
77
- iOSSnapshotTestCase/Core
88
- Nimble (7.3.4)
9-
- PopupDialog (1.0.0):
9+
- PopupDialog (1.1.0):
1010
- DynamicBlurView (~> 3.0.1)
1111
- SwiftLint (0.31.0)
1212

@@ -31,9 +31,9 @@ SPEC CHECKSUMS:
3131
DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
3232
iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
3333
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
34-
PopupDialog: 5f8057d0d01c19d6cd4984ccc533b30c797fa40f
34+
PopupDialog: 42fb7a0bc4fafdf89fef8b5b2b127a6023f3e1cc
3535
SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
3636

3737
PODFILE CHECKSUM: 745b14824f525113e600d7bfeeb81d4a978d6f28
3838

39-
COCOAPODS: 1.5.3
39+
COCOAPODS: 1.6.1

‎Example/Pods/Local Podspecs/PopupDialog.podspec.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Manifest.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 1077 additions & 1004 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/PopupDialog.xcscheme‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/DynamicBlurView/DynamicBlurView-Info.plist‎

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/DynamicBlurView/DynamicBlurView.xcconfig‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)