diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index edbd7245a..5737ae566 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ on: jobs: xcode14: - name: "Xcode 14" + name: "Xcode 15" runs-on: macos-latest strategy: diff --git a/.jazzy.yml b/.jazzy.yml index e6aea3e99..a2d928495 100644 --- a/.jazzy.yml +++ b/.jazzy.yml @@ -100,7 +100,6 @@ custom_categories: - RxCollectionViewDataSourcePrefetchingProxy - RxCollectionViewDataSourceProxy - RxCollectionViewDelegateProxy - - RxDelegateProxyCrashFix - RxNavigationControllerDelegateProxy - RxPickerViewDataSourceProxy - RxPickerViewDelegateProxy diff --git a/Sources/AllTestz/main.swift b/Sources/AllTestz/main.swift index ccbe4be16..4d6eee064 100644 --- a/Sources/AllTestz/main.swift +++ b/Sources/AllTestz/main.swift @@ -296,6 +296,18 @@ final class EventTests_ : EventTests, RxTestCase { ] } } +final class Foo_ : Foo, RxTestCase { + #if os(macOS) + required override init() { + super.init() + } + #endif + + static var allTests: [(String, (Foo_) -> () -> Void)] { return [ + ("testObservableFactoryClosureLifetime", Foo.testObservableFactoryClosureLifetime), + ] } +} + final class HistoricalSchedulerTest_ : HistoricalSchedulerTest, RxTestCase { #if os(macOS) required override init() { @@ -1657,6 +1669,7 @@ final class ObservableTest_ : ObservableTest, RxTestCase { ("testAsObservable_hides", ObservableTest.testAsObservable_hides), ("testAsObservable_never", ObservableTest.testAsObservable_never), ("testSubscribeWithNext", ObservableTest.testSubscribeWithNext), + ("testDeferredFactoryClosureLifetime", ObservableTest.testDeferredFactoryClosureLifetime), ] } } @@ -2234,6 +2247,7 @@ func XCTMain(_ tests: [() -> Void]) { testCase(DisposeBagTest_.allTests), testCase(DriverTest_.allTests), testCase(EventTests_.allTests), + testCase(Foo_.allTests), testCase(HistoricalSchedulerTest_.allTests), testCase(InfallibleCombineLatestTest_.allTests), testCase(InfallibleTest_.allTests), diff --git a/scripts/common.sh b/scripts/common.sh index 6b9fd8f37..3f412b34f 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -21,28 +21,28 @@ BOLDWHITE="\033[1m\033[37m" # make sure all tests are passing if [[ `uname` == "Darwin" ]]; then - echo "🏔 Running iOS 16 / Xcode 14" + echo "🏔 Running iOS 17 / Xcode 15" - if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-16- | wc -l` -ge 1 ]; then - DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-14/iOS/16.2 + if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-17- | wc -l` -ge 1 ]; then + DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-14/iOS/17.4 else - echo "No iOS 16.* Simulator found, available runtimes are:" + echo "No iOS 17.* Simulator found, available runtimes are:" xcrun simctl list runtimes exit -1 fi - if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-9- | wc -l` -ge 1 ]; then - DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-Series-8-45mm/watchOS/9.0 + if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-10- | wc -l` -ge 1 ]; then + DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-Series-8-45mm/watchOS/10.0 else - echo "No watchOS 9.* Simulator found, available runtimes are:" + echo "No watchOS 10.* Simulator found, available runtimes are:" xcrun simctl list runtimes exit -1 fi - if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-16- | wc -l` -ge 1 ]; then - DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/16.0 + if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-17- | wc -l` -ge 1 ]; then + DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/17.0 else - echo "No tvOS 16.* Simulator found, available runtimes are:" + echo "No tvOS 17.* Simulator found, available runtimes are:" xcrun simctl list runtimes exit -1 fi