Skip to content

Commit 5ee9816

Browse files
DivineDominionMalcolm Jarvis
DivineDominion
and
Malcolm Jarvis
authored
Fixe Carthage build error (#44)
* touch CHANGELOG to trigger CI * replace combined target with regular iOS framework target * add macOS framework target * separate macOS and iOS testing targets * fix signing * remove obsolete macOS test folder * add watchOS target * add tvOS target * fix ReSwift framework lookup in test targets * remove obsolete individual tvOS test files * fix scheme name confusion * Fix framework imports and deployment targets * Update changelog for upcoming release * Try Xcode 10.2 for backwards compatibility test * Update version to 2.0.1 Co-authored-by: Malcolm Jarvis <[email protected]>
1 parent 6e62c65 commit 5ee9816

File tree

12 files changed

+1038
-123
lines changed

12 files changed

+1038
-123
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88

99
matrix:
1010
include:
11-
- osx_image: xcode10.1
11+
- osx_image: xcode10.2
1212
env: SCHEME="macOS" SDK="macosx10.14" DESTINATION="arch=x86_64" SWIFT_VERSION="4.2" ACTION="test"
1313
- osx_image: xcode12
1414
env: SCHEME="macOS" SDK="macosx10.15" DESTINATION="arch=x86_64" SWIFT_VERSION="5.3" ACTION="test" POD_LINT="YES"
@@ -36,7 +36,7 @@ script:
3636
- xcodebuild
3737
"$ACTION"
3838
-project "$FRAMEWORK_NAME.xcodeproj"
39-
-scheme "$FRAMEWORK_NAME"
39+
-scheme "$FRAMEWORK_NAME $SCHEME"
4040
-sdk "$SDK"
4141
-destination "$DESTINATION"
4242
-configuration Debug

‎CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
**Fixes:**
88

9+
# 2.0.1
10+
11+
**Fixes:**
12+
13+
- Fixes Carthage build error (#44) - @DivineDominion, @mjarvis
14+
915
# 2.0.0
1016

1117
**Breaking API Changes:**
@@ -15,7 +21,7 @@
1521
**Other:**
1622
- Rename SwiftPM library to `ReSwiftThunk`, this makes naming consistent across all package manager (Cocoapods, Carthage and SwiftPM) (#42) - @jookes
1723
- `ExpectThunk`'s methods `dispatches` and `getsState` no longer have `@discardableResult` return values (#40) - @xavierLowmiller
18-
24+
-
1925
# 1.2.0
2026

2127
**API Changes:**

‎ReSwift-Thunk-tvOS/Info.plist

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
</dict>
22+
</plist>

‎ReSwift-Thunk-tvOS/ReSwift_Thunk_tvOS.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// ReSwift_Thunk_tvOS.h
3+
// ReSwift-Thunk-tvOS
4+
//
5+
// Created by Christian on 26.06.20.
6+
// Copyright © 2020 ReSwift. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
//! Project version number for ReSwift_Thunk_tvOS.
12+
FOUNDATION_EXPORT double ReSwift_Thunk_tvOSVersionNumber;
13+
14+
//! Project version string for ReSwift_Thunk_tvOS.
15+
FOUNDATION_EXPORT const unsigned char ReSwift_Thunk_tvOSVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <ReSwift_Thunk_tvOS/PublicHeader.h>
18+
19+

‎ReSwift-Thunk.xcodeproj/project.pbxproj

Lines changed: 741 additions & 107 deletions
Large diffs are not rendered by default.

‎ReSwift-Thunk.xcodeproj/xcshareddata/xcschemes/ReSwift-Thunk.xcscheme renamed to ‎ReSwift-Thunk.xcodeproj/xcshareddata/xcschemes/ReSwift-Thunk iOS.xcscheme

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
17+
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
1818
BuildableName = "ReSwiftThunk.framework"
19-
BlueprintName = "ReSwift-Thunk"
19+
BlueprintName = "ReSwift-Thunk iOS"
2020
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -30,9 +30,9 @@
3030
<MacroExpansion>
3131
<BuildableReference
3232
BuildableIdentifier = "primary"
33-
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
33+
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
3434
BuildableName = "ReSwiftThunk.framework"
35-
BlueprintName = "ReSwift-Thunk"
35+
BlueprintName = "ReSwift-Thunk iOS"
3636
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
3737
</BuildableReference>
3838
</MacroExpansion>
@@ -42,8 +42,8 @@
4242
<BuildableReference
4343
BuildableIdentifier = "primary"
4444
BlueprintIdentifier = "65A3D6DD218B89A60075CB92"
45-
BuildableName = "ReSwift-Thunk-Tests.xctest"
46-
BlueprintName = "ReSwift-Thunk-Tests"
45+
BuildableName = "ReSwift-Thunk-Tests iOS.xctest"
46+
BlueprintName = "ReSwift-Thunk-Tests iOS"
4747
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
4848
</BuildableReference>
4949
</TestableReference>
@@ -62,9 +62,9 @@
6262
<MacroExpansion>
6363
<BuildableReference
6464
BuildableIdentifier = "primary"
65-
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
65+
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
6666
BuildableName = "ReSwiftThunk.framework"
67-
BlueprintName = "ReSwift-Thunk"
67+
BlueprintName = "ReSwift-Thunk iOS"
6868
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
6969
</BuildableReference>
7070
</MacroExpansion>
@@ -78,9 +78,9 @@
7878
<MacroExpansion>
7979
<BuildableReference
8080
BuildableIdentifier = "primary"
81-
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
81+
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
8282
BuildableName = "ReSwiftThunk.framework"
83-
BlueprintName = "ReSwift-Thunk"
83+
BlueprintName = "ReSwift-Thunk iOS"
8484
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
8585
</BuildableReference>
8686
</MacroExpansion>

‎ReSwift-Thunk.xcodeproj/xcshareddata/xcschemes/ReSwift-Thunk macOS.xcscheme

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1200"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "5036623124A5D8FB003C65ED"
18+
BuildableName = "ReSwiftThunk.framework"
19+
BlueprintName = "ReSwift-Thunk macOS"
20+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "5036623E24A5DA85003C65ED"
36+
BuildableName = "ReSwift-Thunk-Tests macOS.xctest"
37+
BlueprintName = "ReSwift-Thunk-Tests macOS"
38+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<AdditionalOptions>
43+
</AdditionalOptions>
44+
</TestAction>
45+
<LaunchAction
46+
buildConfiguration = "Debug"
47+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
48+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
launchStyle = "0"
50+
useCustomWorkingDirectory = "NO"
51+
ignoresPersistentStateOnLaunch = "NO"
52+
debugDocumentVersioning = "YES"
53+
debugServiceExtension = "internal"
54+
allowLocationSimulation = "YES">
55+
<MacroExpansion>
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "5036623124A5D8FB003C65ED"
59+
BuildableName = "ReSwiftThunk.framework"
60+
BlueprintName = "ReSwift-Thunk macOS"
61+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
62+
</BuildableReference>
63+
</MacroExpansion>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<MacroExpansion>
74+
<BuildableReference
75+
BuildableIdentifier = "primary"
76+
BlueprintIdentifier = "5036623124A5D8FB003C65ED"
77+
BuildableName = "ReSwiftThunk.framework"
78+
BlueprintName = "ReSwift-Thunk macOS"
79+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
80+
</BuildableReference>
81+
</MacroExpansion>
82+
</ProfileAction>
83+
<AnalyzeAction
84+
buildConfiguration = "Debug">
85+
</AnalyzeAction>
86+
<ArchiveAction
87+
buildConfiguration = "Release"
88+
revealArchiveInOrganizer = "YES">
89+
</ArchiveAction>
90+
</Scheme>

‎ReSwift-Thunk.xcodeproj/xcshareddata/xcschemes/ReSwift-Thunk tvOS.xcscheme

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1200"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "5036626024A5DC31003C65ED"
18+
BuildableName = "ReSwiftThunk.framework"
19+
BlueprintName = "ReSwift-Thunk tvOS"
20+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "5036626824A5DC32003C65ED"
36+
BuildableName = "ReSwift-Thunk-Tests tvOS.xctest"
37+
BlueprintName = "ReSwift-Thunk-Tests tvOS"
38+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "Debug"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "YES"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "5036626024A5DC31003C65ED"
64+
BuildableName = "ReSwiftThunk.framework"
65+
BlueprintName = "ReSwift-Thunk tvOS"
66+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎ReSwift-Thunk.xcodeproj/xcshareddata/xcschemes/ReSwift-Thunk watchOS.xcscheme

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1200"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "5036624E24A5DB68003C65ED"
18+
BuildableName = "ReSwiftThunk.framework"
19+
BlueprintName = "ReSwift-Thunk watchOS"
20+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "5036624E24A5DB68003C65ED"
54+
BuildableName = "ReSwiftThunk.framework"
55+
BlueprintName = "ReSwift-Thunk watchOS"
56+
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎ReSwift-Thunk/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<key>CFBundleName</key>
1414
<string>$(PRODUCT_NAME)</string>
1515
<key>CFBundlePackageType</key>
16-
<string>FMWK</string>
16+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
</dict>

0 commit comments

Comments
 (0)