Skip to content

Commit

Permalink
Update to Xcode 11 GM
Browse files Browse the repository at this point in the history
  • Loading branch information
@freak4pc
freak4pc committed Sep 13, 2019
1 parent 0ff0d09 commit 8c682b9
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 32 deletions.
58 changes: 29 additions & 29 deletions ExampleApp/ExampleApp.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,19 +7,19 @@
objects = {

/* Begin PBXBuildFile section */
16A290BC2E27CF47E632A3B8 /* Pods_ExampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B704C183DF3C49484D0FC40A /* Pods_ExampleApp.framework */; };
A26EB6C022B0397A006A57F9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A26EB6BF22B0397A006A57F9 /* AppDelegate.swift */; };
A26EB6C222B0397A006A57F9 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A26EB6C122B0397A006A57F9 /* SceneDelegate.swift */; };
A26EB6C422B0397A006A57F9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A26EB6C322B0397A006A57F9 /* ViewController.swift */; };
A26EB6C722B0397A006A57F9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A26EB6C522B0397A006A57F9 /* Main.storyboard */; };
A26EB6C922B0397C006A57F9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A26EB6C822B0397C006A57F9 /* Assets.xcassets */; };
A26EB6CC22B0397C006A57F9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A26EB6CA22B0397C006A57F9 /* LaunchScreen.storyboard */; };
A2838BCA22B03AA500808FB2 /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2838BC922B03AA500808FB2 /* Example.swift */; };
D05F8BFD40E02065595EE0E6 /* Pods_ExampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 710D17345D7BA7F2C2F65DF7 /* Pods_ExampleApp.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
3D31EBDA20881EAE4B234A2B /* Pods-ExampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.debug.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.debug.xcconfig"; sourceTree = "<group>"; };
710D17345D7BA7F2C2F65DF7 /* Pods_ExampleApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
04E5A60733794FBFF91FD10C /* Pods-ExampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.release.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.release.xcconfig"; sourceTree = "<group>"; };
53C7367904650D29CE5478A7 /* Pods-ExampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.debug.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.debug.xcconfig"; sourceTree = "<group>"; };
A26EB6BC22B0397A006A57F9 /* ExampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
A26EB6BF22B0397A006A57F9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
A26EB6C122B0397A006A57F9 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -29,25 +29,25 @@
A26EB6CB22B0397C006A57F9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A26EB6CD22B0397C006A57F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A2838BC922B03AA500808FB2 /* Example.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Example.swift; sourceTree = "<group>"; };
CC6F4F242D0CE56B720366EE /* Pods-ExampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.release.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.release.xcconfig"; sourceTree = "<group>"; };
B704C183DF3C49484D0FC40A /* Pods_ExampleApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
A26EB6B922B0397A006A57F9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D05F8BFD40E02065595EE0E6 /* Pods_ExampleApp.framework in Frameworks */,
16A290BC2E27CF47E632A3B8 /* Pods_ExampleApp.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
074F796A9E8F54AB348D4E6D /* Frameworks */ = {
4C5FF8CD362E3039D6EDF5AC /* Frameworks */ = {
isa = PBXGroup;
children = (
710D17345D7BA7F2C2F65DF7 /* Pods_ExampleApp.framework */,
B704C183DF3C49484D0FC40A /* Pods_ExampleApp.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -58,7 +58,7 @@
A26EB6BE22B0397A006A57F9 /* ExampleApp */,
A26EB6BD22B0397A006A57F9 /* Products */,
B389CCE8590A639BECE24C62 /* Pods */,
074F796A9E8F54AB348D4E6D /* Frameworks */,
4C5FF8CD362E3039D6EDF5AC /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -88,8 +88,8 @@
B389CCE8590A639BECE24C62 /* Pods */ = {
isa = PBXGroup;
children = (
3D31EBDA20881EAE4B234A2B /* Pods-ExampleApp.debug.xcconfig */,
CC6F4F242D0CE56B720366EE /* Pods-ExampleApp.release.xcconfig */,
53C7367904650D29CE5478A7 /* Pods-ExampleApp.debug.xcconfig */,
04E5A60733794FBFF91FD10C /* Pods-ExampleApp.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand All @@ -101,11 +101,11 @@
isa = PBXNativeTarget;
buildConfigurationList = A26EB6D022B0397C006A57F9 /* Build configuration list for PBXNativeTarget "ExampleApp" */;
buildPhases = (
756B27761A008CCF857B7B14 /* [CP] Check Pods Manifest.lock */,
6E3ABA54040574885F3331BD /* [CP] Check Pods Manifest.lock */,
A26EB6B822B0397A006A57F9 /* Sources */,
A26EB6B922B0397A006A57F9 /* Frameworks */,
A26EB6BA22B0397A006A57F9 /* Resources */,
48A742840FDB8C03CE8DB6C9 /* [CP] Embed Pods Frameworks */,
B2F64257D3AC062630759C93 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -163,43 +163,43 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
48A742840FDB8C03CE8DB6C9 /* [CP] Embed Pods Frameworks */ = {
6E3ABA54040574885F3331BD /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ExampleApp-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
756B27761A008CCF857B7B14 /* [CP] Check Pods Manifest.lock */ = {
B2F64257D3AC062630759C93 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ExampleApp-checkManifestLockResult.txt",
"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleApp/Pods-ExampleApp-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -354,7 +354,7 @@
};
A26EB6D122B0397C006A57F9 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3D31EBDA20881EAE4B234A2B /* Pods-ExampleApp.debug.xcconfig */;
baseConfigurationReference = 53C7367904650D29CE5478A7 /* Pods-ExampleApp.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -373,7 +373,7 @@
};
A26EB6D222B0397C006A57F9 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CC6F4F242D0CE56B720366EE /* Pods-ExampleApp.release.xcconfig */;
baseConfigurationReference = 04E5A60733794FBFF91FD10C /* Pods-ExampleApp.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand Down
6 changes: 3 additions & 3 deletions ExampleApp/Podfile.lock
View file
@@ -1,5 +1,5 @@
PODS:
- RxCombine (1.1.0):
- RxCombine (1.2.0):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxRelay (5.0.0):
Expand All @@ -19,10 +19,10 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
RxCombine: 795d180ad238505f7957a545266a590462499eea
RxCombine: 049c9adb0d0aef07c3f299502c1e43520fe5d580
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f

PODFILE CHECKSUM: 27ab59783b75a3dbb4fec21bad1cf7a4348abaa3

COCOAPODS: 1.7.3
COCOAPODS: 1.7.5
8 changes: 8 additions & 0 deletions Sources/Rx+Combine/Relays+Combine.swift
View file
Expand Up @@ -27,6 +27,10 @@ extension BehaviorRelay: Combine.Subject {
accept(value)
}

public func send(subscription: Subscription) {
/// no-op: Relays don't have anything to do with a Combine subscription
}

public func send(completion: Subscribers.Completion<Never>) {
/// no-op: Relays don't complete and can't error out
}
Expand All @@ -49,6 +53,10 @@ extension PublishRelay: Combine.Subject {
accept(value)
}

public func send(subscription: Subscription) {
/// no-op: Relays don't have anything to do with a Combine subscription
}

public func send(completion: Subscribers.Completion<Never>) {
/// no-op: Relays don't complete and can't error out
}
Expand Down
8 changes: 8 additions & 0 deletions Sources/Rx+Combine/Subjects+Combine.swift
View file
Expand Up @@ -29,6 +29,10 @@ extension BehaviorSubject: Combine.Subject {
}
}

public func send(subscription: Subscription) {
/// no-op: Relays don't have anything to do with a Combine subscription
}

public typealias Output = Element
public typealias Failure = Swift.Error
}
Expand All @@ -53,6 +57,10 @@ extension PublishSubject: Combine.Subject {
}
}

public func send(subscription: Subscription) {
/// no-op: Relays don't have anything to do with a Combine subscription
}

public typealias Output = Element
public typealias Failure = Swift.Error
}

0 comments on commit 8c682b9

Please sign in to comment.