Update swift test configs

yannickl · yannickl · commit bf0c9e615120 · 2019-09-22T18:37:51.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@ DerivedData
 *.hmap
 *.xccheckout
 *.txt
+.swiftpm/*
+.build/*
+DynamicColor.xcodeproj
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: objective-c
-osx_image: xcode10.2
+osx_image: xcode11
 script:
   - brew install swiftlint || brew upgrade swiftlint
   - swiftlint lint --path Sources/ --config ../.swiftlint.yml
-  - cd Examples
+  - swift package -c release generate-xcodeproj
   - xcodebuild -version
-  - xcodebuild -project DynamicColorExample.xcodeproj -scheme iOSTests -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" -configuration Release ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
+  - xcodebuild -project DynamicColor.xcodeproj -scheme DynamicColor-Package -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
   - bash <(curl -s https://codecov.io/bash) -cF ios
-  - xcodebuild -project DynamicColorExample.xcodeproj -scheme OSXTests -sdk macosx -configuration Release -enableCodeCoverage YES test
+  - xcodebuild -project DynamicColor.xcodeproj -scheme DynamicColor-Package -sdk macosx -configuration Release -enableCodeCoverage YES test
   - bash <(curl -s https://codecov.io/bash) -cF osx
diff --git a/Examples/DynamicColorExample.xcodeproj/project.pbxproj b/Examples/DynamicColorExample.xcodeproj/project.pbxproj
diff --git a/Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/OSXTests.xcscheme b/Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/OSXTests.xcscheme
diff --git a/Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme b/Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme
diff --git a/Examples/OSXTests/Info.plist b/Examples/OSXTests/Info.plist
diff --git a/Examples/WatchOSExample WatchKit App/Info.plist b/Examples/WatchOSExample WatchKit App/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Examples/WatchOSExample WatchKit Extension/Info.plist b/Examples/WatchOSExample WatchKit Extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Examples/WatchOSExample.xcodeproj/project.pbxproj b/Examples/WatchOSExample.xcodeproj/project.pbxproj
@@ -555,6 +555,7 @@
 			buildSettings = {
 				INFOPLIST_FILE = "WatchOSExample WatchKit Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.WatchOSExample.watchkitapp.watchkitextension;
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
@@ -569,6 +570,7 @@
 			buildSettings = {
 				INFOPLIST_FILE = "WatchOSExample WatchKit Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.WatchOSExample.watchkitapp.watchkitextension;
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
@@ -586,6 +588,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				IBSC_MODULE = WatchOSExample_WatchKit_Extension;
 				INFOPLIST_FILE = "WatchOSExample WatchKit App/Info.plist";
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.WatchOSExample.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -602,6 +605,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				IBSC_MODULE = WatchOSExample_WatchKit_Extension;
 				INFOPLIST_FILE = "WatchOSExample WatchKit App/Info.plist";
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.WatchOSExample.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -617,6 +621,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = WatchOSExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.WatchOSExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -628,6 +633,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = WatchOSExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.WatchOSExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
diff --git a/Examples/WatchOSExample/Info.plist b/Examples/WatchOSExample/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Examples/iOSTests/Info.plist b/Examples/iOSTests/Info.plist
diff --git a/Tests/DynamicColor+HSBTests.swift b/Tests/DynamicColor+HSBTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 let TestsAcceptedAccuracy = CGFloat(0.000001)
 
diff --git a/Tests/DynamicColor+HSLTests.swift b/Tests/DynamicColor+HSLTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicColorHSLTests: XCTestCase {
   func testInitWithHSLComponents() {
diff --git a/Tests/DynamicColor+RGBATests.swift b/Tests/DynamicColor+RGBATests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicColorRGBATests: XCTestCase {
   func testInit() {
diff --git a/Tests/DynamicColor+XYZTests.swift b/Tests/DynamicColor+XYZTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicColorXYZTests: XCTestCase {
   func testInitWithXYZComponents() {
diff --git a/Tests/DynamicColorArrayTests.swift b/Tests/DynamicColorArrayTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicColorArrayTests: XCTestCase {
   func testGradientProperty() {
diff --git a/Tests/DynamicColorLabTests.swift b/Tests/DynamicColorLabTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicColorLabTests: XCTestCase {
   func testInitWithLabComponents() {
diff --git a/Tests/DynamicColorTests.swift b/Tests/DynamicColorTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicColorTests: XCTestCase {
   func testColorFromHexString() {
diff --git a/Tests/DynamicGradientTests.swift b/Tests/DynamicGradientTests.swift
@@ -25,7 +25,7 @@
  */
 
 import XCTest
-import DynamicColor
+@testable import DynamicColor
 
 class DynamicGradientTests: XCTestCase {
   func testColorPalette() {
