Skip to content

Commit

Permalink
Fixe Carthage build error (#44)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
DivineDominion and Malcolm Jarvis committed Oct 19, 2020
1 parent 6e62c65 commit 5ee9816
Show file tree
Hide file tree
Showing 12 changed files with 1,038 additions and 123 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:

matrix:
include:
- osx_image: xcode10.1
- osx_image: xcode10.2
env: SCHEME="macOS" SDK="macosx10.14" DESTINATION="arch=x86_64" SWIFT_VERSION="4.2" ACTION="test"
- osx_image: xcode12
env: SCHEME="macOS" SDK="macosx10.15" DESTINATION="arch=x86_64" SWIFT_VERSION="5.3" ACTION="test" POD_LINT="YES"
Expand Down Expand Up @@ -36,7 +36,7 @@ script:
- xcodebuild
"$ACTION"
-project "$FRAMEWORK_NAME.xcodeproj"
-scheme "$FRAMEWORK_NAME"
-scheme "$FRAMEWORK_NAME $SCHEME"
-sdk "$SDK"
-destination "$DESTINATION"
-configuration Debug
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@

**Fixes:**

# 2.0.1

**Fixes:**

- Fixes Carthage build error (#44) - @DivineDominion, @mjarvis

# 2.0.0

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

-
# 1.2.0

**API Changes:**
Expand Down
22 changes: 22 additions & 0 deletions ReSwift-Thunk-tvOS/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http:https://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>
19 changes: 19 additions & 0 deletions ReSwift-Thunk-tvOS/ReSwift_Thunk_tvOS.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// ReSwift_Thunk_tvOS.h
// ReSwift-Thunk-tvOS
//
// Created by Christian on 26.06.20.
// Copyright © 2020 ReSwift. All rights reserved.
//

#import <Foundation/Foundation.h>

//! Project version number for ReSwift_Thunk_tvOS.
FOUNDATION_EXPORT double ReSwift_Thunk_tvOSVersionNumber;

//! Project version string for ReSwift_Thunk_tvOS.
FOUNDATION_EXPORT const unsigned char ReSwift_Thunk_tvOSVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <ReSwift_Thunk_tvOS/PublicHeader.h>


848 changes: 741 additions & 107 deletions ReSwift-Thunk.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk"
BlueprintName = "ReSwift-Thunk iOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -30,9 +30,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk"
BlueprintName = "ReSwift-Thunk iOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -42,8 +42,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "65A3D6DD218B89A60075CB92"
BuildableName = "ReSwift-Thunk-Tests.xctest"
BlueprintName = "ReSwift-Thunk-Tests"
BuildableName = "ReSwift-Thunk-Tests iOS.xctest"
BlueprintName = "ReSwift-Thunk-Tests iOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</TestableReference>
Expand All @@ -62,9 +62,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk"
BlueprintName = "ReSwift-Thunk iOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -78,9 +78,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "65A3D6D4218B89A60075CB92"
BlueprintIdentifier = "5036621B24A5D7DE003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk"
BlueprintName = "ReSwift-Thunk iOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036623124A5D8FB003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk macOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036623E24A5DA85003C65ED"
BuildableName = "ReSwift-Thunk-Tests macOS.xctest"
BlueprintName = "ReSwift-Thunk-Tests macOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036623124A5D8FB003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk macOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036623124A5D8FB003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk macOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036626024A5DC31003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk tvOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036626824A5DC32003C65ED"
BuildableName = "ReSwift-Thunk-Tests tvOS.xctest"
BlueprintName = "ReSwift-Thunk-Tests tvOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036626024A5DC31003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk tvOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036624E24A5DB68003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk watchOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5036624E24A5DB68003C65ED"
BuildableName = "ReSwiftThunk.framework"
BlueprintName = "ReSwift-Thunk watchOS"
ReferencedContainer = "container:ReSwift-Thunk.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
4 changes: 2 additions & 2 deletions ReSwift-Thunk/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
Expand Down
Binary file added ReSwiftThunk.framework.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion ReSwiftThunk.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "ReSwiftThunk"
spec.version = "2.0.0"
spec.version = "2.0.1"
spec.summary = "Thunk middleware for ReSwift."
spec.description = <<-DESC
ReSwift-Thunk allows you to write action creators that return a function instead of an action. Instead of dispatching an `Action` directly, you can dispatch a `Thunk` that creates an action at a later time, for example after a network request finishes.
Expand Down

0 comments on commit 5ee9816

Please sign in to comment.