Skip to content

Swift 3.0 preview 4 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Swift 3.0 preview 4 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94fb531
Merge remote-tracking branch 'crossroadlabs/master'
ypopovych Aug 12, 2016
873cdf1
Xcode 8 Beta 4 settings.
ypopovych Aug 12, 2016
9605743
Swift 3.0 preview 4 travis.yml
ypopovych Aug 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 7 additions & 22 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ matrix:
- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
- xcodebuild build -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-watchOS -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'
os: osx
osx_image: xcode7.3
osx_image: xcode8
language: objective-c
before_install:
- brew update
Expand All @@ -30,22 +30,6 @@ matrix:
on:
repo: crossroadlabs/PathToRegex
tags: true
- script:
- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-OSX
#- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6'
- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
- xcodebuild build -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-watchOS -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'
os: osx
osx_image: xcode8
language: objective-c
before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
# - brew outdated xctool || brew upgrade xctool
before_script:
# bootstrap the dependencies for the project
# you can remove if you don't have dependencies
- carthage bootstrap
- script:
- swift build && swift test
sudo: required
Expand All @@ -55,11 +39,12 @@ matrix:
# install original swift distribution
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
- cd ..
- export SWIFT_VERSION="swift-3.0-preview-1"
- wget https://swift.org/builds/$SWIFT_VERSION/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz
- tar xzf $SWIFT_VERSION-ubuntu14.04.tar.gz
- export PATH="${PWD}/${SWIFT_VERSION}-ubuntu14.04/usr/bin:${PATH}"
- export LD_LIBRARY_PATH="${PWD}/${SWIFT_VERSION}-ubuntu14.04/usr/lib/swift/linux/:$LD_LIBRARY_PATH"
- export SWIFT_VERSION="swift-3.0-preview-4"
- SWIFT_VERSION_UPPER=`echo $SWIFT_VERSION | perl -n -e'/^(.*?)-([\.\d]*?)-(.*)$/; $code = uc $3; print "$1-$2-${code}"'`
- wget https://swift.org/builds/$SWIFT_VERSION/ubuntu1404/$SWIFT_VERSION_UPPER/$SWIFT_VERSION_UPPER-ubuntu14.04.tar.gz
- tar xzf $SWIFT_VERSION_UPPER-ubuntu14.04.tar.gz
- export PATH="${PWD}/${SWIFT_VERSION_UPPER}-ubuntu14.04/usr/bin:${PATH}"
- export LD_LIBRARY_PATH="${PWD}/${SWIFT_VERSION_UPPER}-ubuntu14.04/usr/lib/swift/linux/:$LD_LIBRARY_PATH"
# get back home
- cd $MODULE_NAME
notifications:
Expand Down
9 changes: 3 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ import PackageDescription

let package = Package(
name: "PathToRegex",
targets: [
Target(
name: "PathToRegex"
)
],
dependencies: [.Package(url: "https://github.com/crossroadlabs/Regex.git", majorVersion: 0, minor: 7)]
dependencies: [
.Package(url: "https://github.com/crossroadlabs/Regex.git", majorVersion: 0, minor: 7)
]
)
3 changes: 2 additions & 1 deletion PathToRegex.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Pod::Spec.new do |s|
s.license = { :type => 'LGPL v3', :file => 'LICENSE' }
s.author = { "Crossroad Labs" => "[email protected]" }
s.source = { :git => "https://github.com/crossroadlabs/PathToRegex.git", :tag => "#{s.version}" }
s.source_files = 'PathToRegex/**/*.swift'

s.source_files = 'Sources/PathToRegex/*.swift'

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
Expand Down
64 changes: 33 additions & 31 deletions PathToRegex.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@
65E7DABD1C690A4300C5D00A = {
isa = PBXGroup;
children = (
65E7DAC91C690A4300C5D00A /* PathToRegex */,
65E7DAD51C690A4300C5D00A /* PathToRegexTests */,
92748D9F1D5DD395000707CA /* Sources */,
92748DA01D5DD3B4000707CA /* Tests */,
962A8B391C74E5B8008E2BB3 /* Frameworks */,
65E7DAC81C690A4300C5D00A /* Products */,
);
Expand Down Expand Up @@ -251,14 +251,14 @@
path = PathToRegex;
sourceTree = "<group>";
};
65E7DAD51C690A4300C5D00A /* PathToRegexTests */ = {
65E7DAD51C690A4300C5D00A /* PathToRegexTestSuite */ = {
isa = PBXGroup;
children = (
65E7DAD61C690A4300C5D00A /* PathToRegexTests.swift */,
65E7DAD81C690A4300C5D00A /* Info.plist */,
);
name = PathToRegexTests;
path = Tests/PathToRegex;
name = PathToRegexTestSuite;
path = PathToRegex;
sourceTree = "<group>";
};
923F051D1D17F4C700DB5A62 /* Mac */ = {
Expand Down Expand Up @@ -301,6 +301,22 @@
path = watchOS;
sourceTree = "<group>";
};
92748D9F1D5DD395000707CA /* Sources */ = {
isa = PBXGroup;
children = (
65E7DAC91C690A4300C5D00A /* PathToRegex */,
);
path = Sources;
sourceTree = "<group>";
};
92748DA01D5DD3B4000707CA /* Tests */ = {
isa = PBXGroup;
children = (
65E7DAD51C690A4300C5D00A /* PathToRegexTestSuite */,
);
path = Tests;
sourceTree = "<group>";
};
962A8B391C74E5B8008E2BB3 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -720,6 +736,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -760,6 +777,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -779,10 +797,9 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -804,10 +821,9 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -860,16 +876,14 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -888,16 +902,14 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -914,13 +926,11 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Tests/PathToRegex/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegexTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -935,13 +945,11 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Tests/PathToRegex/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegexTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -959,15 +967,14 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -986,15 +993,14 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
Expand All @@ -1016,8 +1022,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
};
Expand All @@ -1036,8 +1041,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -1056,15 +1060,14 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/watchOS",
);
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
Expand All @@ -1084,15 +1087,14 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/watchOS",
);
INFOPLIST_FILE = PathToRegex/Info.plist;
INFOPLIST_FILE = Sources/PathToRegex/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.PathToRegex;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
Expand Down
0 PathToRegex/Info.plist → Sources/PathToRegex/Info.plist
View file
Open in desktop
File renamed without changes.
0 PathToRegex/PathToRegex.swift → Sources/PathToRegex/PathToRegex.swift
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Tests/PathToRegex/PathToRegexTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import XCTest
import Regex

@testable import PathToRegex

class PathToRegexTests: XCTestCase {
Expand Down