Skip to content

Commit

Permalink
Update to Swift 3
Browse files Browse the repository at this point in the history
  • Loading branch information
tlandsberg committed Sep 26, 2016
1 parent 8acf7a0 commit b73d0e0
Show file tree
Hide file tree
Showing 15 changed files with 355 additions and 576 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@ matrix:
xcode_project: BitUnits.xcodeproj
xcode_scheme: BitUnits
script: xcodebuild -scheme BitUnits test
osx_image: xcode7.2
osx_image: xcode8
- os: linux
sudo: required
dist: trusty
before_install:
- sudo apt-get install -y libicu-dev
- "./install-swift-linux.sh"
- sudo apt-get update -qq
- sudo apt-get install -qq clang libicu-dev
- export SWIFT_VERSION="swift-3.0"
- echo "Installing ${SWIFT_VERSION}..."
- curl -s -L -O "https://swift.org/builds/${SWIFT_VERSION}-release/ubuntu1404/${SWIFT_VERSION}-RELEASE/${SWIFT_VERSION}-RELEASE-ubuntu14.04.tar.gz"
- tar -zxvf "${SWIFT_VERSION}-RELEASE-ubuntu14.04.tar.gz"
- sudo mv "${SWIFT_VERSION}-RELEASE-ubuntu14.04" /swift
- export PATH="/swift/usr/bin:${PATH}"
script:
- swift build -vv
- swift build --verbose
- swift test --verbose
notifications:
slack:
secure: ibfxxRBm5oklCoglwN/oEs0oHi8j/2S3lTzxiiYQmfmlza9gdji5bxhi+g26h+Q8EN3glqfYvCiex4hG7U8cmet2CmWW3lqtSvTCGJuLIRx4rlShndH1eqly/VesOFoSfOMz+gKPU/jp+hEsh7FlV7g+4LlZN31DMnamj7bX93nEacjrE08NjN1o2p5UXfiwC8uxtZMO/VcfsraSExSI7Cl/eI0G+jb8jG8jRz5NXtQzSEJYHcERwxlXEdnLmbcEwULP3YoYESzuet4zdUw5+DoOfJcSBSsblyw2hbPbZo6Ni/6epbzRjwRau2Yk6rOR1TiTS/tVHCCmX8lypr7DFIezC3uACbWYE12bDgOlV0Mxn4i1CfYCTU4yeF8mxIQ56vi4tnFE/Emf+YeaSRAMxHd+T0JFPdID6KIShOBuzsuNr+xX4oepA3e/9XGa6Dm2sLqkCxY6j3S/Wqhz5pLwaX/cy+UljIkVemFq0bDDGw+SYTLXkidwUO+6KMG/mzBnkKxNTi07VDGa3NmpMq5aoBEfVgqc/cWEFWOAuHCv4MbswHi9fPJIo0AvJsrjEpUONShr6jxziTPEN4ZbPTLZTFDCG1PV1yV4xwreR2uS1ygy2vZo4QBebO7+XblHpbUmSh+clpI+TB19IoGNqA/c5zXs1WVGzUt1wFNTiujV9Lc=
25 changes: 25 additions & 0 deletions BitUnits.xcodeproj/BitUnitsTests_Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
25 changes: 25 additions & 0 deletions BitUnits.xcodeproj/BitUnits_Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
7 changes: 7 additions & 0 deletions BitUnits.xcodeproj/Configs/Project.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
PRODUCT_NAME = $(TARGET_NAME)
SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator
MACOSX_DEPLOYMENT_TARGET = 10.10
DYLIB_INSTALL_NAME_BASE = @rpath
OTHER_SWIFT_FLAGS = -DXcode
COMBINE_HIDPI_IMAGES = YES
USE_HEADERMAP = NO
Loading

0 comments on commit b73d0e0

Please sign in to comment.