Xcode 10 issues.

RxSwiftCommunity · Sep 16, 2018 · bf1ef16 · bf1ef16
1 parent dad8948
commit bf1ef16
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 781 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "RxSwift"]
-	path = RxSwift
-	url = https://github.com/ReactiveX/RxSwift.git
 [submodule "Examples/RxSwift"]
 	path = Examples/RxSwift
 	url = https://github.com/ReactiveX/RxSwift.git
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,8 @@ notifications:
 install: true
 
 env:
-  - BUILD="pod repo update && pod update  && set -o pipefail && (xcodebuild -workspace RxDataSources.xcworkspace -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
-  - BUILD="./dependencies.sh              && set -o pipefail && (xcodebuild -project   RxDataSources.xcodeproj   -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project   RxDataSources.xcodeproj   -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project   RxDataSources.xcodeproj   -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
-  - BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project   RxDataSources.xcodeproj   -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project   RxDataSources.xcodeproj   -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project   RxDataSources.xcodeproj   -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
+  - BUILD="pushd Examples && ./dependencies.sh && set -o pipefail && (xcodebuild -project Example.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project   Example.xcodeproj   -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
+  - BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project   RxDataSources.xcodeproj   -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test) | xcpretty"
   - BUILD="pod repo update && pod lib lint RxDataSources.podspec --verbose && pod lib lint Differentiator.podspec --verbose "
   - BUILD="carthage update --platform iOS  && carthage build --no-skip-current --platform iOS"
   - BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+git "/Users/kzaher/Projects/RxSwift" "4.3.0"
diff --git a/Examples/Example.xcodeproj/project.pbxproj b/Examples/Example.xcodeproj/project.pbxproj
@@ -20,6 +20,8 @@
 		C81FBF631F3B9DC00094061E /* IntegerType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF611F3B9DC00094061E /* IntegerType+IdentifiableType.swift */; };
 		C81FBF641F3B9DC00094061E /* String+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF621F3B9DC00094061E /* String+IdentifiableType.swift */; };
 		C81FBF661F3B9DF60094061E /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF651F3B9DF60094061E /* AnimationConfiguration.swift */; };
+		C8241D7D214E75C6008C463E /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C88AC715214D9BA800C1A3E5 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		C8241D7E214E75CB008C463E /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C88AC71D214D9BA800C1A3E5 /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C82C3C5B1F3B937500309AE8 /* Differentiator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C82C3C541F3B937500309AE8 /* Differentiator.framework */; };
 		C82C3C5C1F3B937500309AE8 /* Differentiator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C82C3C541F3B937500309AE8 /* Differentiator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C82C3C871F3B939100309AE8 /* AnimatableSectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C611F3B938C00309AE8 /* AnimatableSectionModel.swift */; };
@@ -294,8 +296,10 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				C8241D7E214E75CB008C463E /* RxCocoa.framework in Embed Frameworks */,
 				C87C34A31F363B3000DB85FE /* RxDataSources.framework in Embed Frameworks */,
 				C82C3C5C1F3B937500309AE8 /* Differentiator.framework in Embed Frameworks */,
+				C8241D7D214E75C6008C463E /* RxSwift.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Examples/Example.xcodeproj/xcshareddata/xcschemes/Differentiator.xcscheme b/Examples/Example.xcodeproj/xcshareddata/xcschemes/Differentiator.xcscheme
diff --git a/Examples/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Examples/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
                BuildableName = "Example.app"
                BlueprintName = "Example"
-               ReferencedContainer = "container:RxDataSources.xcodeproj">
+               ReferencedContainer = "container:Example.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,37 +26,16 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C8984CB01C36B723001E4272"
-               BuildableName = "ExampleUITests.xctest"
-               BlueprintName = "ExampleUITests"
-               ReferencedContainer = "container:RxDataSources.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C81905AD1DEA019100AE679C"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:RxDataSources.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
             BuildableName = "Example.app"
             BlueprintName = "Example"
-            ReferencedContainer = "container:RxDataSources.xcodeproj">
+            ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -80,7 +58,7 @@
             BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
             BuildableName = "Example.app"
             BlueprintName = "Example"
-            ReferencedContainer = "container:RxDataSources.xcodeproj">
+            ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -99,7 +77,7 @@
             BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
             BuildableName = "Example.app"
             BlueprintName = "Example"
-            ReferencedContainer = "container:RxDataSources.xcodeproj">
+            ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

diff --git a/Examples/Example.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme b/Examples/Example.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -20,7 +19,7 @@
                BlueprintIdentifier = "C8984CB01C36B723001E4272"
                BuildableName = "ExampleUITests.xctest"
                BlueprintName = "ExampleUITests"
-               ReferencedContainer = "container:RxDataSources.xcodeproj">
+               ReferencedContainer = "container:Example.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -31,7 +30,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Examples/Example.xcodeproj/xcshareddata/xcschemes/RxDataSources.xcscheme b/Examples/Example.xcodeproj/xcshareddata/xcschemes/RxDataSources.xcscheme