From 1c7a5be3dfe466fbee5dab915355430ea243c7cf Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Sun, 21 Jan 2024 00:07:48 +0100 Subject: [PATCH 01/31] family --- PromiseKit.xcodeproj/project.pbxproj | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 6361b1800..e3effa411 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -1087,8 +1087,11 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "$(AVAILABLE_PLATFORMS)"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - TARGETED_DEVICE_FAMILY = "1,2,3,4"; + TARGETED_DEVICE_FAMILY = "1,2,3,4,6"; }; name = Debug; }; @@ -1142,8 +1145,11 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "$(AVAILABLE_PLATFORMS)"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - TARGETED_DEVICE_FAMILY = "1,2,3,4"; + TARGETED_DEVICE_FAMILY = "1,2,3,4,6"; }; name = Release; }; From 446e919ab5760e67a7d76f642b03beba9b8a4d1b Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 06:35:27 +0100 Subject: [PATCH 02/31] visionOS --- PromiseKit.podspec | 1 + PromiseKit.xcodeproj/project.pbxproj | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index a4a0f26fa..19f2ada05 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -28,6 +28,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.13' s.watchos.deployment_target = '4.0' s.tvos.deployment_target = '10.0' + s.visionos.deployment_target = '1.0' s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods', diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index e3effa411..4909c42bc 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -976,6 +976,7 @@ TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; WATCHOS_DEPLOYMENT_TARGET = 4.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; }; @@ -1034,6 +1035,7 @@ TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; WATCHOS_DEPLOYMENT_TARGET = 4.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; }; @@ -1091,7 +1093,7 @@ SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - TARGETED_DEVICE_FAMILY = "1,2,3,4,6"; + TARGETED_DEVICE_FAMILY = "1,2,3,4,6,7"; }; name = Debug; }; @@ -1149,7 +1151,7 @@ SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - TARGETED_DEVICE_FAMILY = "1,2,3,4,6"; + TARGETED_DEVICE_FAMILY = "1,2,3,4,6,7"; }; name = Release; }; From e1ad01286fcbb56967d7b2732b5c0978eb906b47 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 06:38:55 +0100 Subject: [PATCH 03/31] Formatting --- PromiseKit.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 4909c42bc..5af26743e 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -976,7 +976,7 @@ TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; WATCHOS_DEPLOYMENT_TARGET = 4.0; - XROS_DEPLOYMENT_TARGET = 1.0; + XROS_DEPLOYMENT_TARGET = 1.1; }; name = Debug; }; @@ -1035,7 +1035,7 @@ TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; WATCHOS_DEPLOYMENT_TARGET = 4.0; - XROS_DEPLOYMENT_TARGET = 1.0; + XROS_DEPLOYMENT_TARGET = 1.1; }; name = Release; }; From c226911219e50bafb06074143906103fedb2f535 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 06:51:03 +0100 Subject: [PATCH 04/31] 1.0 again --- PromiseKit.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 5af26743e..ecb672bbb 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -976,7 +976,7 @@ TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; WATCHOS_DEPLOYMENT_TARGET = 4.0; - XROS_DEPLOYMENT_TARGET = 1.1; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; }; @@ -1035,7 +1035,7 @@ TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; WATCHOS_DEPLOYMENT_TARGET = 4.0; - XROS_DEPLOYMENT_TARGET = 1.1; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; }; From e23ce00fafd3c75b06b552b4ebcdd111620c60f3 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 06:51:54 +0100 Subject: [PATCH 05/31] Update ci-podspec.yml --- .github/workflows/ci-podspec.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml index 8906b016c..e12d61a8a 100644 --- a/.github/workflows/ci-podspec.yml +++ b/.github/workflows/ci-podspec.yml @@ -7,6 +7,9 @@ jobs: lint: runs-on: macos-latest steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: 15.2 - uses: actions/checkout@v2 with: submodules: true From 42f8d70c485dd82b2ae5890175e364d6c0a9d9ae Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:01:26 +0100 Subject: [PATCH 06/31] macos-14 --- .github/workflows/ci-podspec.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml index e12d61a8a..c2045748c 100644 --- a/.github/workflows/ci-podspec.yml +++ b/.github/workflows/ci-podspec.yml @@ -5,11 +5,8 @@ on: - PromiseKit.podspec jobs: lint: - runs-on: macos-latest + runs-on: macos-14 steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 15.2 - uses: actions/checkout@v2 with: submodules: true From cd528f72419dcbb504406e8cce5030e0a453025a Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:13:23 +0100 Subject: [PATCH 07/31] Xcode 15.2 --- .github/workflows/ci-podspec.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml index c2045748c..703e90b7e 100644 --- a/.github/workflows/ci-podspec.yml +++ b/.github/workflows/ci-podspec.yml @@ -7,6 +7,9 @@ jobs: lint: runs-on: macos-14 steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: 15.2 - uses: actions/checkout@v2 with: submodules: true From 42a2ae09b6948266e7fa707a2dc18bc9d117f0a5 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:22:29 +0100 Subject: [PATCH 08/31] xros --- PromiseKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 19f2ada05..662de5942 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.13' s.watchos.deployment_target = '4.0' s.tvos.deployment_target = '10.0' - s.visionos.deployment_target = '1.0' + s.xros.deployment_target = '1.0' s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods', From f0792c9c581d1398b85e7ab8489113210a1bd1e1 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:25:49 +0100 Subject: [PATCH 09/31] Revert "xros" This reverts commit 42a2ae09b6948266e7fa707a2dc18bc9d117f0a5. --- PromiseKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 662de5942..19f2ada05 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.13' s.watchos.deployment_target = '4.0' s.tvos.deployment_target = '10.0' - s.xros.deployment_target = '1.0' + s.visionos.deployment_target = '1.0' s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods', From 11bf16f256f42239cc6514d3251d7a18093cdf65 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:34:07 +0100 Subject: [PATCH 10/31] cocoapods --- .github/workflows/ci-podspec.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml index 703e90b7e..991d8208c 100644 --- a/.github/workflows/ci-podspec.yml +++ b/.github/workflows/ci-podspec.yml @@ -7,9 +7,9 @@ jobs: lint: runs-on: macos-14 steps: - - uses: maxim-lobanov/setup-xcode@v1 + - uses: maxim-lobanov/setup-cocoapods@v1 with: - xcode-version: 15.2 + version: 1.5.0 - uses: actions/checkout@v2 with: submodules: true From 8929619b2cb68134ad460daaa64d243837b5ae4f Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:42:42 +0100 Subject: [PATCH 11/31] swift_version --- PromiseKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 19f2ada05..6ac69cbf9 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation' s.requires_arc = true - s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5'] + s.swift_version = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5'] # CocoaPods requires us to specify the root deployment targets # even though for us it is nonsense. Our root spec has no From 7dba5cc100fb749e88086916965d18afcb9a9829 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:43:56 +0100 Subject: [PATCH 12/31] No [] --- PromiseKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 6ac69cbf9..f3b0d0895 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation' s.requires_arc = true - s.swift_version = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5'] + s.swift_version = '3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5' # CocoaPods requires us to specify the root deployment targets # even though for us it is nonsense. Our root spec has no From a9b0b5a7ac8c4405d4f50867ea4030f210cf1456 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:53:40 +0100 Subject: [PATCH 13/31] CocoaPods 1.15.0 --- .github/workflows/ci-podspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml index 991d8208c..04897784b 100644 --- a/.github/workflows/ci-podspec.yml +++ b/.github/workflows/ci-podspec.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: maxim-lobanov/setup-cocoapods@v1 with: - version: 1.5.0 + version: 1.15.0 - uses: actions/checkout@v2 with: submodules: true From efc905cf858ef13a1814f2549d82099238ee70a5 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 07:59:57 +0100 Subject: [PATCH 14/31] Xcode 15.2 --- .github/workflows/ci-podspec.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml index 04897784b..df559f69c 100644 --- a/.github/workflows/ci-podspec.yml +++ b/.github/workflows/ci-podspec.yml @@ -7,6 +7,9 @@ jobs: lint: runs-on: macos-14 steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: 15.2 - uses: maxim-lobanov/setup-cocoapods@v1 with: version: 1.15.0 From 907567a238e001750b90f398eed2bd173db2c322 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Tue, 13 Feb 2024 08:19:17 +0100 Subject: [PATCH 15/31] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71262b25a..849b8baea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,8 +100,8 @@ jobs: runs-on: ${{ matrix.macos }} strategy: matrix: - xcode: [^11, ^12, ^13] - macos: [macos-11] + xcode: [^15] + macos: [macos-14] steps: - uses: maxim-lobanov/setup-xcode@v1 with: From e39e00fa51249ec961648ed552749720471779b1 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Wed, 14 Feb 2024 09:42:47 +0100 Subject: [PATCH 16/31] With warnings --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 849b8baea..e1b016310 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,12 +108,6 @@ jobs: xcode-version: ${{ matrix.xcode }} - uses: actions/checkout@v2 - - uses: mingjun97/file-regex-replace@v1 - with: - regex: SWIFT_TREAT_WARNINGS_AS_ERRORS = NO - replacement: SWIFT_TREAT_WARNINGS_AS_ERRORS = YES - include: project.pbxproj - - run: | if [ ${{ matrix.xcode }} != ^11 ]; then echo "CARTHAGE_ARGS=--use-xcframeworks" >> $GITHUB_ENV From 6115f6dacf78bd41de1f198405af9520d822011e Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Thu, 15 Feb 2024 09:17:39 +0100 Subject: [PATCH 17/31] No Carthage --- .github/workflows/ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1b016310..2564d8c94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,21 +95,3 @@ jobs: action: test enable-code-coverage: true - uses: codecov/codecov-action@v1 - - carthage: - runs-on: ${{ matrix.macos }} - strategy: - matrix: - xcode: [^15] - macos: [macos-14] - steps: - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: ${{ matrix.xcode }} - - uses: actions/checkout@v2 - - - run: | - if [ ${{ matrix.xcode }} != ^11 ]; then - echo "CARTHAGE_ARGS=--use-xcframeworks" >> $GITHUB_ENV - fi - - run: carthage build --no-skip-current --no-use-binaries $CARTHAGE_ARGS From 273f7b81a39220cd908f5825db0da2527b06875c Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Thu, 15 Feb 2024 11:49:56 +0100 Subject: [PATCH 18/31] Xcode 15 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2564d8c94..582674e88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,17 +75,17 @@ jobs: - run: git diff --exit-code test: - runs-on: macos-latest + runs-on: macos-14 strategy: matrix: dst: - platform=macOS - - platform=tvOS Simulator,OS=15.0,name=Apple TV - - platform=iOS Simulator,OS=15.0,name=iPhone 12 + - platform=tvOS Simulator,OS=17.0,name=Apple TV + - platform=iOS Simulator,OS=17.0,name=iPhone 15 steps: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 13.1 + xcode-version: 15.2 - uses: actions/checkout@v2 - uses: sersoft-gmbh/xcodebuild-action@v1 with: From f1fd32a1c2392d2a771a28e1a175fc6221134764 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Thu, 15 Feb 2024 12:07:00 +0100 Subject: [PATCH 19/31] More platforms --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 582674e88..c4b2292de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,8 +80,10 @@ jobs: matrix: dst: - platform=macOS - - platform=tvOS Simulator,OS=17.0,name=Apple TV - - platform=iOS Simulator,OS=17.0,name=iPhone 15 + - platform=tvOS + - platform=iOS + - platform=watchOS + - platform=visionOS steps: - uses: maxim-lobanov/setup-xcode@v1 with: From dc25593e30601a48e70c7d09ef11c9fa16a2ec18 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Thu, 15 Feb 2024 13:11:53 +0100 Subject: [PATCH 20/31] Any device --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4b2292de..6af0ab049 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,11 +79,10 @@ jobs: strategy: matrix: dst: - - platform=macOS - - platform=tvOS - - platform=iOS - - platform=watchOS - - platform=visionOS + - platform=macOS,name=Any Mac + - platform=tvOS,name=Any tvOS Device + - platform=iOS,name=Any iOS Device + - platform=watchOS,name=Any watchOS Device steps: - uses: maxim-lobanov/setup-xcode@v1 with: From e2a7f48b370ad845aa7f2b5583b41d74be9b0a0e Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 08:07:51 +0100 Subject: [PATCH 21/31] Trying to break tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6af0ab049..8fd49eb76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: strategy: matrix: dst: - - platform=macOS,name=Any Mac + - platform=macOS,name=Any Ma - platform=tvOS,name=Any tvOS Device - platform=iOS,name=Any iOS Device - platform=watchOS,name=Any watchOS Device From 529f6aa33ff978850f6d7ff37b9b268bc022ddfd Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 08:40:52 +0100 Subject: [PATCH 22/31] "" --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fd49eb76..7fad404bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: strategy: matrix: dst: - - platform=macOS,name=Any Ma + - platform=macOS,name="Any Ma" - platform=tvOS,name=Any tvOS Device - platform=iOS,name=Any iOS Device - platform=watchOS,name=Any watchOS Device From e7c03a09677dbc7412338268329a56451bdb9006 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 08:53:13 +0100 Subject: [PATCH 23/31] With id --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fad404bc..b9c1252b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: strategy: matrix: dst: - - platform=macOS,name="Any Ma" + - platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642 - platform=tvOS,name=Any tvOS Device - platform=iOS,name=Any iOS Device - platform=watchOS,name=Any watchOS Device From 2858ee0a98f55cf181b4195e89242ddc19a5a80d Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 09:01:53 +0100 Subject: [PATCH 24/31] ids --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9c1252b3..84e75fea4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,9 +80,9 @@ jobs: matrix: dst: - platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642 - - platform=tvOS,name=Any tvOS Device - - platform=iOS,name=Any iOS Device - - platform=watchOS,name=Any watchOS Device + - platform=tvOS Simulator,id=0EB16E3F-8F5F-4EEF-BFEC-18C3A4FAB91C,OS=17.2,name=Apple TV + - platform=iOS Simulator,id=5AC1B28F-A59B-4ADC-B89A-9A7DBC14C752,OS=17.0.1,name=iPhone 15 + - platform=watchOS Simulator,id=821F9864-6742-4DE4-BD95-A5A252620E09,OS=10.2,name=Apple Watch Series 9 (45mm) steps: - uses: maxim-lobanov/setup-xcode@v1 with: From b54973c3291a9a8d0d36b30d0bbea798b9166a3c Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 12:59:42 +0100 Subject: [PATCH 25/31] macOS device --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84e75fea4..b13460501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,10 +79,10 @@ jobs: strategy: matrix: dst: - - platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642 - - platform=tvOS Simulator,id=0EB16E3F-8F5F-4EEF-BFEC-18C3A4FAB91C,OS=17.2,name=Apple TV - - platform=iOS Simulator,id=5AC1B28F-A59B-4ADC-B89A-9A7DBC14C752,OS=17.0.1,name=iPhone 15 - - platform=watchOS Simulator,id=821F9864-6742-4DE4-BD95-A5A252620E09,OS=10.2,name=Apple Watch Series 9 (45mm) + - "platform:macOS,arch:arm64,id:0000FE00-392BB8A41C01F642" + #- "platform:tvOS Simulator,id:0EB16E3F-8F5F-4EEF-BFEC-18C3A4FAB91C,OS:17.2,name:Apple TV" + #- "platform:iOS Simulator,id:5AC1B28F-A59B-4ADC-B89A-9A7DBC14C752,OS:17.0.1,name:iPhone 15" + #- "platform:watchOS Simulator,id:821F9864-6742-4DE4-BD95-A5A252620E09,OS:10.2,name:Apple Watch Series 9 (45mm)" steps: - uses: maxim-lobanov/setup-xcode@v1 with: From 0bea5c91f76b5e58b74dc1cdf0cb012a597fd157 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 13:24:39 +0100 Subject: [PATCH 26/31] macOS only --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b13460501..612fa157b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,10 +79,7 @@ jobs: strategy: matrix: dst: - - "platform:macOS,arch:arm64,id:0000FE00-392BB8A41C01F642" - #- "platform:tvOS Simulator,id:0EB16E3F-8F5F-4EEF-BFEC-18C3A4FAB91C,OS:17.2,name:Apple TV" - #- "platform:iOS Simulator,id:5AC1B28F-A59B-4ADC-B89A-9A7DBC14C752,OS:17.0.1,name:iPhone 15" - #- "platform:watchOS Simulator,id:821F9864-6742-4DE4-BD95-A5A252620E09,OS:10.2,name:Apple Watch Series 9 (45mm)" + - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642" steps: - uses: maxim-lobanov/setup-xcode@v1 with: From 27950c3380f4922205e18fbd620dc2fe41724e1e Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 15:27:05 +0100 Subject: [PATCH 27/31] tvOS --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 612fa157b..701bff843 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,6 +80,7 @@ jobs: matrix: dst: - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642" + - "platform=tvOS Simulator,OS=17.2,name=Apple TV" steps: - uses: maxim-lobanov/setup-xcode@v1 with: From 530c275656303449dd9e198dfd9bf49a179e8b21 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 16:49:26 +0100 Subject: [PATCH 28/31] iOS/watchOS --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 701bff843..70ee0c699 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,9 @@ jobs: matrix: dst: - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642" + - "platform=iOS Simulator,OS=17.0.1,name=iPhone 14" - "platform=tvOS Simulator,OS=17.2,name=Apple TV" + - "platform=watchOS Simulator,OS=10.2,name=Apple Watch Series 9 (45mm)" steps: - uses: maxim-lobanov/setup-xcode@v1 with: From 0a1af5a48c3a5910a2ac7551dd0e43da9d7b61d2 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 17:17:25 +0100 Subject: [PATCH 29/31] Fixing watchOS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70ee0c699..26b6c841d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642" - "platform=iOS Simulator,OS=17.0.1,name=iPhone 14" - "platform=tvOS Simulator,OS=17.2,name=Apple TV" - - "platform=watchOS Simulator,OS=10.2,name=Apple Watch Series 9 (45mm)" + - "platform=watchOS Simulator" steps: - uses: maxim-lobanov/setup-xcode@v1 with: From cd1db4534ce2c2f79b928781785a6ad48e37fe44 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 17:40:32 +0100 Subject: [PATCH 30/31] watchOS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26b6c841d..3c250db0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642" - "platform=iOS Simulator,OS=17.0.1,name=iPhone 14" - "platform=tvOS Simulator,OS=17.2,name=Apple TV" - - "platform=watchOS Simulator" + - "platform=watchOS Simulator,OS=9.4,name=Apple Watch Series 5 (40mm)" steps: - uses: maxim-lobanov/setup-xcode@v1 with: From d08144844ef750bfd51917bd9b9b8ebb52d37aab Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Fri, 16 Feb 2024 17:51:24 +0100 Subject: [PATCH 31/31] No watchOS --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c250db0b..d49c258c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,6 @@ jobs: - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642" - "platform=iOS Simulator,OS=17.0.1,name=iPhone 14" - "platform=tvOS Simulator,OS=17.2,name=Apple TV" - - "platform=watchOS Simulator,OS=9.4,name=Apple Watch Series 5 (40mm)" steps: - uses: maxim-lobanov/setup-xcode@v1 with: