From 963e1bc30fcb19ad2789316b4ed7ae3bde72e188 Mon Sep 17 00:00:00 2001 From: temrich Date: Tue, 8 Jan 2019 23:28:42 -0800 Subject: [PATCH] Updates Travis to Xcode10 and updates Swift version from 4.0 to 4.2. (#93) * Updates Travis to Xcode10 and updates Swift version from 4.0 to 4.2. * Removes `-wmo` copts flag from `PromisesTestHelpers` target due to bug when building against Xcode 10. --- .travis.yml | 9 +++- BUILD | 2 +- Package.swift | 2 +- ...BLPromisesInteroperabilityTests_Info.plist | 41 +++++++++---------- .../FBLPromisesPerformanceTests_Info.plist | 41 +++++++++---------- .../FBLPromisesTests_Info.plist | 41 +++++++++---------- .../PromisesInteroperabilityTests_Info.plist | 41 +++++++++---------- .../PromisesPerformanceTests_Info.plist | 41 +++++++++---------- Promises.xcodeproj/PromisesTests_Info.plist | 41 +++++++++---------- Promises.xcodeproj/project.pbxproj | 38 ++++++++++++----- PromisesSwift.podspec | 2 +- 11 files changed, 158 insertions(+), 141 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79edf07..2a54e90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,14 @@ os: osx -osx_image: xcode9 +osx_image: xcode10.1 language: objective-c install: true +addons: + homebrew: + taps: homebrew/cask-versions + casks: java8 before_install: - brew update - brew install bazel script: - - bazel --batch test Tests --spawn_strategy=standalone --genrule_strategy=standalone --test_strategy=standalone --noshow_progress --noshow_loading_progress --verbose_failures --test_verbose_timeout_warnings --test_output=errors + - bazel shutdown + - bazel test Tests --nokeep_state_after_build --spawn_strategy=standalone --genrule_strategy=standalone --test_strategy=standalone --noshow_progress --noshow_loading_progress --verbose_failures --test_verbose_timeout_warnings --test_output=errors diff --git a/BUILD b/BUILD index c2b6c44..466fd28 100644 --- a/BUILD +++ b/BUILD @@ -37,7 +37,7 @@ swift_library( srcs = glob([ "Sources/PromisesTestHelpers/*.swift", ]), - copts = SWIFT_COPTS, + copts = [], module_name = "PromisesTestHelpers", deps = [ ":Promises", diff --git a/Package.swift b/Package.swift index af0d966..e7800ca 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:4.2 // swiftlint:disable line_length // swiftlint:disable trailing_comma diff --git a/Promises.xcodeproj/FBLPromisesInteroperabilityTests_Info.plist b/Promises.xcodeproj/FBLPromisesInteroperabilityTests_Info.plist index a84a50b..b83e522 100644 --- a/Promises.xcodeproj/FBLPromisesInteroperabilityTests_Info.plist +++ b/Promises.xcodeproj/FBLPromisesInteroperabilityTests_Info.plist @@ -1,26 +1,25 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.$(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.google.$(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + diff --git a/Promises.xcodeproj/FBLPromisesPerformanceTests_Info.plist b/Promises.xcodeproj/FBLPromisesPerformanceTests_Info.plist index a84a50b..b83e522 100644 --- a/Promises.xcodeproj/FBLPromisesPerformanceTests_Info.plist +++ b/Promises.xcodeproj/FBLPromisesPerformanceTests_Info.plist @@ -1,26 +1,25 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.$(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.google.$(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + diff --git a/Promises.xcodeproj/FBLPromisesTests_Info.plist b/Promises.xcodeproj/FBLPromisesTests_Info.plist index a84a50b..b83e522 100644 --- a/Promises.xcodeproj/FBLPromisesTests_Info.plist +++ b/Promises.xcodeproj/FBLPromisesTests_Info.plist @@ -1,26 +1,25 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.$(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.google.$(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + diff --git a/Promises.xcodeproj/PromisesInteroperabilityTests_Info.plist b/Promises.xcodeproj/PromisesInteroperabilityTests_Info.plist index a84a50b..b83e522 100644 --- a/Promises.xcodeproj/PromisesInteroperabilityTests_Info.plist +++ b/Promises.xcodeproj/PromisesInteroperabilityTests_Info.plist @@ -1,26 +1,25 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.$(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.google.$(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + diff --git a/Promises.xcodeproj/PromisesPerformanceTests_Info.plist b/Promises.xcodeproj/PromisesPerformanceTests_Info.plist index a84a50b..b83e522 100644 --- a/Promises.xcodeproj/PromisesPerformanceTests_Info.plist +++ b/Promises.xcodeproj/PromisesPerformanceTests_Info.plist @@ -1,26 +1,25 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.$(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.google.$(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + diff --git a/Promises.xcodeproj/PromisesTests_Info.plist b/Promises.xcodeproj/PromisesTests_Info.plist index a84a50b..b83e522 100644 --- a/Promises.xcodeproj/PromisesTests_Info.plist +++ b/Promises.xcodeproj/PromisesTests_Info.plist @@ -1,26 +1,25 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.$(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.google.$(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + diff --git a/Promises.xcodeproj/project.pbxproj b/Promises.xcodeproj/project.pbxproj index 1399212..06eef17 100644 --- a/Promises.xcodeproj/project.pbxproj +++ b/Promises.xcodeproj/project.pbxproj @@ -1313,7 +1313,8 @@ OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = FBLPromisesInteroperabilityTests; }; name = Debug; @@ -1338,7 +1339,8 @@ OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = FBLPromisesInteroperabilityTests; }; name = Release; @@ -1362,6 +1364,7 @@ OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromisesPerformanceTests; }; name = Debug; @@ -1385,6 +1388,7 @@ OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromisesPerformanceTests; }; name = Release; @@ -1401,7 +1405,8 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = PromisesTests; }; name = Debug; @@ -1418,7 +1423,8 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = PromisesTests; }; name = Release; @@ -1442,6 +1448,7 @@ OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromisesTests; }; name = Debug; @@ -1465,6 +1472,7 @@ OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromisesTests; }; name = Release; @@ -1481,7 +1489,8 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = PromisesPerformanceTests; }; name = Debug; @@ -1498,7 +1507,8 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = PromisesPerformanceTests; }; name = Release; @@ -1515,7 +1525,8 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = PromisesInteroperabilityTests; }; name = Debug; @@ -1532,7 +1543,8 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 4.2; TARGET_NAME = PromisesInteroperabilityTests; }; name = Release; @@ -1591,6 +1603,7 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = Promises; }; name = Debug; @@ -1611,6 +1624,7 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = Promises; }; name = Release; @@ -1638,6 +1652,7 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromisesTestHelpers; }; name = Debug; @@ -1665,6 +1680,7 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromisesTestHelpers; }; name = Release; @@ -1692,6 +1708,7 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromises; }; name = Debug; @@ -1719,6 +1736,7 @@ PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; TARGET_NAME = FBLPromises; }; name = Release; @@ -1766,7 +1784,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; USE_HEADERMAP = NO; WATCHOS_DEPLOYMENT_TARGET = 2.0; @@ -1813,7 +1831,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; USE_HEADERMAP = NO; WATCHOS_DEPLOYMENT_TARGET = 2.0; diff --git a/PromisesSwift.podspec b/PromisesSwift.podspec index 4fc2e53..de3f13e 100644 --- a/PromisesSwift.podspec +++ b/PromisesSwift.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.10' s.tvos.deployment_target = '9.0' s.watchos.deployment_target = '2.0' - s.swift_version = '4.0' + s.swift_version = '4.2' s.module_name = 'Promises' s.source_files = "Sources/#{s.module_name}/*.{swift}"