Skip to content

Commit

Permalink
Swift 5 support (#310)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mwfire committed Apr 5, 2019
1 parent 270bcf9 commit 9c6e8ef
Show file tree
Hide file tree
Showing 42 changed files with 1,367 additions and 1,108 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
language: objective-c
osx_image: xcode10.1
osx_image: xcode10.2
env:
global:
- WORKSPACE=Example/PopupDialog.xcworkspace
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
- IOS_SDK=iphonesimulator12.1
- IOS_SDK=iphonesimulator12.2
matrix:
- 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"
- DESTINATION="OS=12.2,name=iPhone " SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-, 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
Expand All @@ -20,7 +20,7 @@ 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
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog
* **0.1.0** Pinned Swift version to 4.2<br>Dropped iOS 9 support as of moving to ios-snapshot-test-case
* **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
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PODS:
- iOSSnapshotTestCase/SwiftSupport (6.0.2):
- iOSSnapshotTestCase/Core
- Nimble (7.3.4)
- PopupDialog (1.0.0):
- PopupDialog (1.1.0):
- DynamicBlurView (~> 3.0.1)
- SwiftLint (0.31.0)

Expand All @@ -31,9 +31,9 @@ SPEC CHECKSUMS:
DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
PopupDialog: 5f8057d0d01c19d6cd4984ccc533b30c797fa40f
PopupDialog: 42fb7a0bc4fafdf89fef8b5b2b127a6023f3e1cc
SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3

PODFILE CHECKSUM: 745b14824f525113e600d7bfeeb81d4a978d6f28

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
8 changes: 4 additions & 4 deletions Example/Pods/Local Podspecs/PopupDialog.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2,081 changes: 1,077 additions & 1,004 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Example/Pods/Target Support Files/Nimble/Nimble-Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Nimble/Nimble.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9c6e8ef

Please sign in to comment.