diff --git a/.github/workflows/BuildSampleProjects.yml b/.github/workflows/BuildSampleProjects.yml new file mode 100644 index 0000000..4fa4634 --- /dev/null +++ b/.github/workflows/BuildSampleProjects.yml @@ -0,0 +1,32 @@ +name: Build Sample Projects + +on: + push: + branches: main + pull_request: + branches: '**' + +jobs: + buildLegacyProject: + name: "Build Legacy Project" + runs-on: macos-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build + run: | + cd Sample\ Projects/RxSwift\ 5\ App/ + xcodebuild clean -project RxSwift\ 5\ App.xcodeproj -scheme RxSwift\ 5\ App -destination "generic/platform=iOS" + + buildLatestProject: + name: "Build Latest Project" + runs-on: macos-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build + run: | + cd Sample\ Projects/RxSwift\ 6\ App/ + xcodebuild clean -project RxSwift\ 6\ App.xcodeproj -scheme RxSwift\ 6\ App -destination "generic/platform=iOS" \ No newline at end of file diff --git a/.github/workflows/RunTests.yml b/.github/workflows/RunTests.yml index 342ae5b..ffc7585 100644 --- a/.github/workflows/RunTests.yml +++ b/.github/workflows/RunTests.yml @@ -22,4 +22,3 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} name: CombineRx - xcode: true diff --git a/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.pbxproj b/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.pbxproj index ca803f6..2bb7e37 100644 --- a/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.pbxproj +++ b/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + E8C23241286A35F500786086 /* CombineRx in Frameworks */ = {isa = PBXBuildFile; productRef = E8C23240286A35F500786086 /* CombineRx */; }; + E8C23249286A386200786086 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = E8C23248286A386200786086 /* RxCocoa */; }; + E8C2324B286A386200786086 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = E8C2324A286A386200786086 /* RxSwift */; }; ECCD2CD6283CDB8100663179 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD2CD5283CDB8100663179 /* AppDelegate.swift */; }; ECCD2CD8283CDB8100663179 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD2CD7283CDB8100663179 /* SceneDelegate.swift */; }; ECCD2CDA283CDB8100663179 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD2CD9283CDB8100663179 /* ViewController.swift */; }; @@ -15,9 +18,6 @@ ECCD2D0F283CDF8800663179 /* MathsExpressionClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD2D0E283CDF8800663179 /* MathsExpressionClient.swift */; }; ECCD2D16283CDFDF00663179 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD2D15283CDFDF00663179 /* Expression.swift */; }; ECCD2D18283CE13000663179 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD2D17283CE13000663179 /* ViewModel.swift */; }; - ECCD2D34283D46D700663179 /* CombineRx in Frameworks */ = {isa = PBXBuildFile; productRef = ECCD2D33283D46D700663179 /* CombineRx */; }; - ECCD2D36283D46F100663179 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = ECCD2D35283D46F100663179 /* RxSwift */; }; - ECCD2D38283D46F400663179 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = ECCD2D37283D46F400663179 /* RxCocoa */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -38,9 +38,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - ECCD2D38283D46F400663179 /* RxCocoa in Frameworks */, - ECCD2D36283D46F100663179 /* RxSwift in Frameworks */, - ECCD2D34283D46D700663179 /* CombineRx in Frameworks */, + E8C2324B286A386200786086 /* RxSwift in Frameworks */, + E8C23249286A386200786086 /* RxCocoa in Frameworks */, + E8C23241286A35F500786086 /* CombineRx in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -104,9 +104,9 @@ ); name = "RxSwift 5 App"; packageProductDependencies = ( - ECCD2D33283D46D700663179 /* CombineRx */, - ECCD2D35283D46F100663179 /* RxSwift */, - ECCD2D37283D46F400663179 /* RxCocoa */, + E8C23240286A35F500786086 /* CombineRx */, + E8C23248286A386200786086 /* RxCocoa */, + E8C2324A286A386200786086 /* RxSwift */, ); productName = "RxSwift 5 App"; productReference = ECCD2CD2283CDB8100663179 /* RxSwift 5 App.app */; @@ -137,8 +137,8 @@ ); mainGroup = ECCD2CC9283CDB8100663179; packageReferences = ( - ECCD2D10283CDFB100663179 /* XCRemoteSwiftPackageReference "RxSwift" */, - ECCD2D30283D46B100663179 /* XCRemoteSwiftPackageReference "CombineRx" */, + E8C2323F286A35F500786086 /* XCRemoteSwiftPackageReference "CombineRx" */, + E8C23247286A386200786086 /* XCRemoteSwiftPackageReference "RxSwift" */, ); productRefGroup = ECCD2CD3283CDB8100663179 /* Products */; projectDirPath = ""; @@ -317,6 +317,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -344,6 +345,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -381,39 +383,39 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - ECCD2D10283CDFB100663179 /* XCRemoteSwiftPackageReference "RxSwift" */ = { + E8C2323F286A35F500786086 /* XCRemoteSwiftPackageReference "CombineRx" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "git@github.com:ReactiveX/RxSwift.git"; + repositoryURL = "https://github.com/Jackstone92/CombineRx.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.0.0; + minimumVersion = 1.0.0; }; }; - ECCD2D30283D46B100663179 /* XCRemoteSwiftPackageReference "CombineRx" */ = { + E8C23247286A386200786086 /* XCRemoteSwiftPackageReference "RxSwift" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "git@github.com:Jackstone92/CombineRx.git"; + repositoryURL = "https://github.com/ReactiveX/RxSwift.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 1.0.0; + minimumVersion = 5.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - ECCD2D33283D46D700663179 /* CombineRx */ = { + E8C23240286A35F500786086 /* CombineRx */ = { isa = XCSwiftPackageProductDependency; - package = ECCD2D30283D46B100663179 /* XCRemoteSwiftPackageReference "CombineRx" */; + package = E8C2323F286A35F500786086 /* XCRemoteSwiftPackageReference "CombineRx" */; productName = CombineRx; }; - ECCD2D35283D46F100663179 /* RxSwift */ = { + E8C23248286A386200786086 /* RxCocoa */ = { isa = XCSwiftPackageProductDependency; - package = ECCD2D10283CDFB100663179 /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxSwift; + package = E8C23247286A386200786086 /* XCRemoteSwiftPackageReference "RxSwift" */; + productName = RxCocoa; }; - ECCD2D37283D46F400663179 /* RxCocoa */ = { + E8C2324A286A386200786086 /* RxSwift */ = { isa = XCSwiftPackageProductDependency; - package = ECCD2D10283CDFB100663179 /* XCRemoteSwiftPackageReference "RxSwift" */; - productName = RxCocoa; + package = E8C23247286A386200786086 /* XCRemoteSwiftPackageReference "RxSwift" */; + productName = RxSwift; }; /* End XCSwiftPackageProductDependency section */ }; diff --git a/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index eec3ac7..24eb861 100644 --- a/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Sample Projects/RxSwift 5 App/RxSwift 5 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,23 +1,25 @@ { - "pins" : [ - { - "identity" : "combinerx", - "kind" : "remoteSourceControl", - "location" : "git@github.com:Jackstone92/CombineRx.git", - "state" : { - "revision" : "a92daaa4bad7b0437897e4ecc79fb3149cf50cca", - "version" : "1.0.0" + "object": { + "pins": [ + { + "package": "CombineRx", + "repositoryURL": "https://github.com/Jackstone92/CombineRx.git", + "state": { + "branch": null, + "revision": "a92daaa4bad7b0437897e4ecc79fb3149cf50cca", + "version": "1.0.0" + } + }, + { + "package": "RxSwift", + "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", + "state": { + "branch": null, + "revision": "cec68169a048a079f461ba203fe85636548d7a89", + "version": "5.1.3" + } } - }, - { - "identity" : "rxswift", - "kind" : "remoteSourceControl", - "location" : "git@github.com:ReactiveX/RxSwift.git", - "state" : { - "revision" : "cec68169a048a079f461ba203fe85636548d7a89", - "version" : "5.1.3" - } - } - ], - "version" : 2 + ] + }, + "version": 1 } diff --git a/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.pbxproj b/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.pbxproj index 8501a20..79170be 100644 --- a/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.pbxproj +++ b/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.pbxproj @@ -325,6 +325,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -351,6 +352,7 @@ INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -390,7 +392,7 @@ /* Begin XCRemoteSwiftPackageReference section */ ECCD2D26283CFEB700663179 /* XCRemoteSwiftPackageReference "RxSwift" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "git@github.com:ReactiveX/RxSwift.git"; + repositoryURL = "https://github.com/ReactiveX/RxSwift.git"; requirement = { kind = upToNextMajorVersion; minimumVersion = 6.0.0; diff --git a/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2a35548..8dc500e 100644 --- a/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Sample Projects/RxSwift 6 App/RxSwift 6 App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -10,15 +10,6 @@ "version": "0.5.3" } }, - { - "package": "RxSwift", - "repositoryURL": "http://github.com/ReactiveX/RxSwift.git", - "state": { - "branch": null, - "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8", - "version": "6.5.0" - } - }, { "package": "xctest-dynamic-overlay", "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",