From 873cdf1018d37e65777e6048f78ac67f56ec7693 Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Fri, 12 Aug 2016 13:05:14 +0300 Subject: [PATCH 1/2] Xcode 8 Beta 4 settings. Better project structure --- Package.swift | 9 +-- PathToRegex.podspec | 3 +- PathToRegex.xcodeproj/project.pbxproj | 64 ++++++++++--------- .../PathToRegex}/Info.plist | 0 .../PathToRegex}/PathToRegex.swift | 0 Tests/PathToRegex/PathToRegexTests.swift | 1 + 6 files changed, 39 insertions(+), 38 deletions(-) rename {PathToRegex => Sources/PathToRegex}/Info.plist (100%) rename {PathToRegex => Sources/PathToRegex}/PathToRegex.swift (100%) diff --git a/Package.swift b/Package.swift index fdd0b4f..69205c3 100644 --- a/Package.swift +++ b/Package.swift @@ -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) + ] ) diff --git a/PathToRegex.podspec b/PathToRegex.podspec index c9558ec..eb3d33c 100644 --- a/PathToRegex.podspec +++ b/PathToRegex.podspec @@ -6,7 +6,8 @@ Pod::Spec.new do |s| s.license = { :type => 'LGPL v3', :file => 'LICENSE' } s.author = { "Crossroad Labs" => "daniel@crossroadlabs.xyz" } 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' diff --git a/PathToRegex.xcodeproj/project.pbxproj b/PathToRegex.xcodeproj/project.pbxproj index ac088b2..34bc2ce 100644 --- a/PathToRegex.xcodeproj/project.pbxproj +++ b/PathToRegex.xcodeproj/project.pbxproj @@ -221,8 +221,8 @@ 65E7DABD1C690A4300C5D00A = { isa = PBXGroup; children = ( - 65E7DAC91C690A4300C5D00A /* PathToRegex */, - 65E7DAD51C690A4300C5D00A /* PathToRegexTests */, + 92748D9F1D5DD395000707CA /* Sources */, + 92748DA01D5DD3B4000707CA /* Tests */, 962A8B391C74E5B8008E2BB3 /* Frameworks */, 65E7DAC81C690A4300C5D00A /* Products */, ); @@ -251,14 +251,14 @@ path = PathToRegex; sourceTree = ""; }; - 65E7DAD51C690A4300C5D00A /* PathToRegexTests */ = { + 65E7DAD51C690A4300C5D00A /* PathToRegexTestSuite */ = { isa = PBXGroup; children = ( 65E7DAD61C690A4300C5D00A /* PathToRegexTests.swift */, 65E7DAD81C690A4300C5D00A /* Info.plist */, ); - name = PathToRegexTests; - path = Tests/PathToRegex; + name = PathToRegexTestSuite; + path = PathToRegex; sourceTree = ""; }; 923F051D1D17F4C700DB5A62 /* Mac */ = { @@ -301,6 +301,22 @@ path = watchOS; sourceTree = ""; }; + 92748D9F1D5DD395000707CA /* Sources */ = { + isa = PBXGroup; + children = ( + 65E7DAC91C690A4300C5D00A /* PathToRegex */, + ); + path = Sources; + sourceTree = ""; + }; + 92748DA01D5DD3B4000707CA /* Tests */ = { + isa = PBXGroup; + children = ( + 65E7DAD51C690A4300C5D00A /* PathToRegexTestSuite */, + ); + path = Tests; + sourceTree = ""; + }; 962A8B391C74E5B8008E2BB3 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -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 = ""; }; @@ -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 = ""; }; @@ -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; @@ -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; @@ -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; @@ -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; }; @@ -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; }; @@ -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; @@ -959,7 +967,7 @@ "$(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; @@ -967,7 +975,6 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -986,7 +993,7 @@ "$(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; @@ -994,7 +1001,6 @@ 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; @@ -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; }; @@ -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; @@ -1056,7 +1060,7 @@ "$(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; @@ -1064,7 +1068,6 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -1084,7 +1087,7 @@ "$(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; @@ -1092,7 +1095,6 @@ 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; diff --git a/PathToRegex/Info.plist b/Sources/PathToRegex/Info.plist similarity index 100% rename from PathToRegex/Info.plist rename to Sources/PathToRegex/Info.plist diff --git a/PathToRegex/PathToRegex.swift b/Sources/PathToRegex/PathToRegex.swift similarity index 100% rename from PathToRegex/PathToRegex.swift rename to Sources/PathToRegex/PathToRegex.swift diff --git a/Tests/PathToRegex/PathToRegexTests.swift b/Tests/PathToRegex/PathToRegexTests.swift index 979db90..df3f2a4 100644 --- a/Tests/PathToRegex/PathToRegexTests.swift +++ b/Tests/PathToRegex/PathToRegexTests.swift @@ -21,6 +21,7 @@ import XCTest import Regex + @testable import PathToRegex class PathToRegexTests: XCTestCase { From 96057435f07355434f36a3d46f68dae88cf03a6b Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Fri, 12 Aug 2016 13:07:13 +0300 Subject: [PATCH 2/2] Swift 3.0 preview 4 travis.yml --- .travis.yml | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index b58d4bc..e0d8293 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 @@ -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: