Skip to content

Commit

Permalink
Xcode 10 compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
kzaher committed Sep 21, 2018
1 parent 19e43d7 commit 6410999
Show file tree
Hide file tree
Showing 51 changed files with 1,327 additions and 804 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "RxSwift"]
path = RxSwift
[submodule "Examples/RxSwift"]
path = Examples/RxSwift
url = https://github.com/ReactiveX/RxSwift.git
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ sudo: required
dist: trusty
osx_image: xcode9
env:
- BUILD="pod repo update && pod update && set -o pipefail && (xcodebuild -workspace RxFeedback.xcworkspace -scheme RxFeedbackTests -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxFeedback.xcworkspace -scheme Example -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
- BUILD="./dependencies.sh && set -o pipefail && (xcodebuild -project RxFeedback.xcodeproj -scheme RxFeedbackTests -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxFeedback.xcodeproj -scheme Example -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
- BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project RxFeedback.xcodeproj -scheme RxFeedbackTests -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxFeedback.xcodeproj -scheme Example -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
- BUILD="pushd Examples && ./dependencies.sh && set -o pipefail && (xcodebuild -project Examples.xcodeproj -scheme Example -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
- BUILD="pod repo update && pod lib lint RxFeedback.podspec --verbose"
- BUILD="swift build"
- BUILD="carthage update --platform ios && carthage build --no-skip-current --platform iOS"
- BUILD="carthage update --platform ios && carthage build --no-skip-current --platform iOS && set -o pipefail && (xcodebuild -project RxFeedback.xcodeproj -scheme RxFeedbackTests -destination 'platform=iOS Simulator,name=iPhone 7' test) | xcpretty"
- BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"
- BUILD="swift test"

Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.2.0"
github "ReactiveX/RxSwift" "4.3.0"
1,220 changes: 1,220 additions & 0 deletions Examples/Examples.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -17,7 +17,7 @@
BlueprintIdentifier = "C834A8751EB679FB00E6B15E"
BuildableName = "Example.app"
BlueprintName = "Example"
ReferencedContainer = "container:RxFeedback.xcodeproj">
ReferencedContainer = "container:Examples.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -36,7 +35,7 @@
BlueprintIdentifier = "C834A8751EB679FB00E6B15E"
BuildableName = "Example.app"
BlueprintName = "Example"
ReferencedContainer = "container:RxFeedback.xcodeproj">
ReferencedContainer = "container:Examples.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand All @@ -60,7 +58,7 @@
BlueprintIdentifier = "C834A8751EB679FB00E6B15E"
BuildableName = "Example.app"
BlueprintName = "Example"
ReferencedContainer = "container:RxFeedback.xcodeproj">
ReferencedContainer = "container:Examples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
Expand All @@ -79,7 +77,7 @@
BlueprintIdentifier = "C834A8751EB679FB00E6B15E"
BuildableName = "Example.app"
BlueprintName = "Example"
ReferencedContainer = "container:RxFeedback.xcodeproj">
ReferencedContainer = "container:Examples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions Examples/RxSwift
Submodule RxSwift added at 16ea4b
1 change: 1 addition & 0 deletions Examples/Sources
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions Examples/dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
set -e
if [[ ( ! -d "RxSwift/Rx.xcodeproj" ) ]]; then
git submodule update --init --recursive --force
cd RxSwift
git reset origin/master --hard
osascript -e 'tell app "Xcode" to display dialog "We have automatically downloaded git submodules for you and you need to reopen the project so Xcode can detect submodule change properly."'
killall Xcode
fi
17 changes: 0 additions & 17 deletions Podfile

This file was deleted.

Loading

0 comments on commit 6410999

Please sign in to comment.