Skip to content

Commit f184e5d

Browse files
nlutsenkonlutsenko
authored
Merge pull request #32 from BoltsFramework/nlutsenko.configurations
Migrate all targets to shared configurations from xctoolchain.
2 parents d8f0551 + 794a13c commit f184e5d

14 files changed

Lines changed: 275 additions & 301 deletions

‎.codecov.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
coverage:
2+
ignore:
3+
- Tests/.*
4+
status:
5+
patch: false
6+
changes: false
7+
project:
8+
default:
9+
target: 75
10+
comment: false

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Vendor/xctoolchain"]
2+
path = Vendor/xctoolchain
3+
url = https://github.com/ParsePlatform/xctoolchain.git

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cache:
99
env:
1010
matrix:
1111
- TEST_TYPE=iOS
12-
- TEST_TYPE=OSX
12+
- TEST_TYPE=macOS
1313
- TEST_TYPE=tvOS
1414
- TEST_TYPE=Lint
1515
- TEST_TYPE=Distribution
@@ -20,7 +20,7 @@ before_install:
2020
fi
2121
install:
2222
- |
23-
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = OSX ] || [ "$TEST_TYPE" = tvOS ]; then
23+
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ] || [ "$TEST_TYPE" = tvOS ]; then
2424
gem install xcpretty -N --no-ri --no-rdoc
2525
elif [ "$TEST_TYPE" = Lint ]; then
2626
brew install swiftlint || brew upgrade swiftlint
@@ -34,10 +34,10 @@ script:
3434
set -o pipefail
3535
xcodebuild test -project BoltsSwift.xcodeproj -sdk iphonesimulator -scheme BoltsSwift-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
3636
xcodebuild test -project BoltsSwift.xcodeproj -sdk iphonesimulator -scheme BoltsSwift-iOS -configuration Release -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
37-
elif [ "$TEST_TYPE" = OSX ]; then
37+
elif [ "$TEST_TYPE" = macOS ]; then
3838
set -o pipefail
39-
xcodebuild test -project BoltsSwift.xcodeproj -sdk macosx -scheme BoltsSwift-OSX -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
40-
xcodebuild test -project BoltsSwift.xcodeproj -sdk macosx -scheme BoltsSwift-OSX -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
39+
xcodebuild test -project BoltsSwift.xcodeproj -sdk macosx -scheme BoltsSwift-macOS -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
40+
xcodebuild test -project BoltsSwift.xcodeproj -sdk macosx -scheme BoltsSwift-macOS -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
4141
elif [ "$TEST_TYPE" = tvOS ]; then
4242
set -o pipefail
4343
xcodebuild test -project BoltsSwift.xcodeproj -sdk appletvsimulator -scheme BoltsSwift-tvOS -destination "platform=tvOS Simulator,name=Apple TV 1080p" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
@@ -50,6 +50,6 @@ script:
5050
fi
5151
after_success:
5252
- |
53-
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = OSX ] || [ "$TEST_TYPE" = tvOS ]; then
53+
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ] || [ "$TEST_TYPE" = tvOS ]; then
5454
bash <(curl -s https://codecov.io/bash)
5555
fi

‎BoltsSwift.xcodeproj/project.pbxproj‎

Lines changed: 105 additions & 290 deletions
Large diffs are not rendered by default.

BoltsSwift.xcodeproj/xcshareddata/xcschemes/BoltsSwift-OSX.xcscheme renamed to BoltsSwift.xcodeproj/xcshareddata/xcschemes/BoltsSwift-macOS.xcscheme

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,21 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "81CC14EB1A9BE0A100B28F86"
1818
BuildableName = "BoltsSwift.framework"
19-
BlueprintName = "BoltsSwift-OSX"
19+
BlueprintName = "BoltsSwift-macOS"
20+
ReferencedContainer = "container:BoltsSwift.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "81CC14F51A9BE0A100B28F86"
32+
BuildableName = "BoltsSwiftTests.xctest"
33+
BlueprintName = "BoltsSwiftTests-macOS"
2034
ReferencedContainer = "container:BoltsSwift.xcodeproj">
2135
</BuildableReference>
2236
</BuildActionEntry>
@@ -35,7 +49,7 @@
3549
BuildableIdentifier = "primary"
3650
BlueprintIdentifier = "81CC14F51A9BE0A100B28F86"
3751
BuildableName = "BoltsSwiftTests.xctest"
38-
BlueprintName = "BoltsSwiftTests-OSX"
52+
BlueprintName = "BoltsSwiftTests-macOS"
3953
ReferencedContainer = "container:BoltsSwift.xcodeproj">
4054
</BuildableReference>
4155
</TestableReference>
@@ -45,7 +59,7 @@
4559
BuildableIdentifier = "primary"
4660
BlueprintIdentifier = "81CC14EB1A9BE0A100B28F86"
4761
BuildableName = "BoltsSwift.framework"
48-
BlueprintName = "BoltsSwift-OSX"
62+
BlueprintName = "BoltsSwift-macOS"
4963
ReferencedContainer = "container:BoltsSwift.xcodeproj">
5064
</BuildableReference>
5165
</MacroExpansion>
@@ -67,7 +81,7 @@
6781
BuildableIdentifier = "primary"
6882
BlueprintIdentifier = "81CC14EB1A9BE0A100B28F86"
6983
BuildableName = "BoltsSwift.framework"
70-
BlueprintName = "BoltsSwift-OSX"
84+
BlueprintName = "BoltsSwift-macOS"
7185
ReferencedContainer = "container:BoltsSwift.xcodeproj">
7286
</BuildableReference>
7387
</MacroExpansion>
@@ -85,7 +99,7 @@
8599
BuildableIdentifier = "primary"
86100
BlueprintIdentifier = "81CC14EB1A9BE0A100B28F86"
87101
BuildableName = "BoltsSwift.framework"
88-
BlueprintName = "BoltsSwift-OSX"
102+
BlueprintName = "BoltsSwift-macOS"
89103
ReferencedContainer = "container:BoltsSwift.xcodeproj">
90104
</BuildableReference>
91105
</MacroExpansion>

‎Configurations/BoltsSwift-iOS.xcconfig‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//
2+
// Copyright (c) 2016, Facebook, Inc.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/iOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = BoltsSwift
14+
PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.ios
15+
16+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
17+
18+
SWIFT_VERSION = 2.3
19+
20+
INFOPLIST_FILE = $(SRCROOT)/Sources/Info.plist

‎Configurations/BoltsSwift-macOS.xcconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// Copyright (c) 2016, Facebook, Inc.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/macOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = BoltsSwift
14+
PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.macos
15+
16+
SWIFT_VERSION = 2.3
17+
18+
INFOPLIST_FILE = $(SRCROOT)/Sources/Info.plist

‎Configurations/BoltsSwift-tvOS.xcconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// Copyright (c) 2016, Facebook, Inc.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/tvOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = BoltsSwift
14+
PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.tvos
15+
16+
SWIFT_VERSION = 2.3
17+
18+
INFOPLIST_FILE = $(SRCROOT)/Sources/Info.plist

‎Configurations/BoltsSwift-watchOS.xcconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// Copyright (c) 2016, Facebook, Inc.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/watchOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = BoltsSwift
14+
PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.watchos
15+
16+
SWIFT_VERSION = 2.3
17+
18+
INFOPLIST_FILE = $(SRCROOT)/Sources/Info.plist

‎Configurations/BoltsSwiftTests-iOS.xcconfig‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//
2+
// Copyright (c) 2016, Facebook, Inc.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/iOS.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
12+
13+
PRODUCT_NAME = BoltsSwiftTests
14+
PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.ios.tests
15+
16+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
17+
18+
SWIFT_VERSION = 2.3
19+
20+
INFOPLIST_FILE = $(SRCROOT)/Tests/Info.plist

0 commit comments

Comments
 (0)