From ecd3e6dc66b2d145abb867e89fa4512c2f19c31c Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 13:56:17 +0200 Subject: [PATCH 01/12] chore: Xcode 15.3 --- .github/workflows/build.yml | 6 ++++-- .github/workflows/nighlty.yml | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 803009d..d56f4ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,10 @@ jobs: - name: List Xcode versions run: ls /Applications | grep Xcode - - name: Set Xcode version - run: sudo xcode-select -s /Applications/Xcode_14.2.app + - name: Select Xcode version + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.3' - name: Test on iOS run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color diff --git a/.github/workflows/nighlty.yml b/.github/workflows/nighlty.yml index 3beffb4..e983ca8 100644 --- a/.github/workflows/nighlty.yml +++ b/.github/workflows/nighlty.yml @@ -6,12 +6,14 @@ on: jobs: build: name: Build and test - runs-on: macOS-latest + runs-on: macOS-latest steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - - name: Set Xcode version - run: sudo xcode-select -s /Applications/Xcode_11.app + - name: Select Xcode version + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.3' - name: Start websockets test server run: | @@ -21,4 +23,4 @@ jobs: swift build # .build/debug/TestWebsockets& # cd .. - # set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color \ No newline at end of file + # set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color From e42098215cf68b665962e3dbac15f45d5e32ca60 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 13:57:42 +0200 Subject: [PATCH 02/12] Missed one --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d56f4ae..94c2e63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,10 @@ jobs: - name: List Xcode versions run: ls /Applications | grep Xcode - - name: Set Xcode version - run: sudo xcode-select -s /Applications/Xcode_14.2.app + - name: Select Xcode version + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.3' - name: Build run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-${{ matrix.platform }} CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build | xcpretty --color From e1eb550965cb8464f7380a251afc9955b8a0f092 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:13:26 +0200 Subject: [PATCH 03/12] What are the versions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94c2e63..4dac1c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Select Xcode version uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.3' + xcode-version: '15.2' - name: Test on iOS run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color From a2fec51a9d29258365475d62daf4170691cc9cee Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:29:25 +0200 Subject: [PATCH 04/12] What are the versions 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dac1c2..1734300 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Select Xcode version uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.2' + xcode-version: '15.4' - name: Test on iOS run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color From 6fbb59309f214f6960282b1b332fc511b27f81d0 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:31:22 +0200 Subject: [PATCH 05/12] What are the versions 3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1734300..bb86631 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Select Xcode version uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.4' + xcode-version: '15.999' - name: Test on iOS run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color From 0be27c7a742cbff682351095f8c7c7e93c4eddb3 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:32:44 +0200 Subject: [PATCH 06/12] Older version --- .github/workflows/build.yml | 4 ++-- .github/workflows/nighlty.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb86631..f923d35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Select Xcode version uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.999' + xcode-version: '15.0.1' - name: Test on iOS run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color @@ -69,7 +69,7 @@ jobs: - name: Select Xcode version uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.3' + xcode-version: '15.0.1' - name: Build run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-${{ matrix.platform }} CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build | xcpretty --color diff --git a/.github/workflows/nighlty.yml b/.github/workflows/nighlty.yml index e983ca8..e602a6f 100644 --- a/.github/workflows/nighlty.yml +++ b/.github/workflows/nighlty.yml @@ -13,7 +13,7 @@ jobs: - name: Select Xcode version uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.3' + xcode-version: '15.0.1' - name: Start websockets test server run: | From 335aab8082b394febe16b55324070c7ac795656d Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:37:12 +0200 Subject: [PATCH 07/12] iOS builds --- QminderAPI.xcodeproj/project.pbxproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/QminderAPI.xcodeproj/project.pbxproj b/QminderAPI.xcodeproj/project.pbxproj index 7d5360c..f02dbb5 100644 --- a/QminderAPI.xcodeproj/project.pbxproj +++ b/QminderAPI.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -1272,6 +1272,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1300,6 +1301,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 2fa1f8c0f9330b01603f0dd034515d7762d0b06e Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:49:36 +0200 Subject: [PATCH 08/12] watchOS builds --- QminderAPI.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QminderAPI.xcodeproj/project.pbxproj b/QminderAPI.xcodeproj/project.pbxproj index f02dbb5..a993b26 100644 --- a/QminderAPI.xcodeproj/project.pbxproj +++ b/QminderAPI.xcodeproj/project.pbxproj @@ -1624,7 +1624,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 5.0; }; name = Debug; }; @@ -1655,7 +1655,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 5.0; }; name = Release; }; From d125d914c24b0358678a2e14218392f22c19fad7 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 14:53:54 +0200 Subject: [PATCH 09/12] tvOS builds --- QminderAPI.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QminderAPI.xcodeproj/project.pbxproj b/QminderAPI.xcodeproj/project.pbxproj index a993b26..0cbc70c 100644 --- a/QminderAPI.xcodeproj/project.pbxproj +++ b/QminderAPI.xcodeproj/project.pbxproj @@ -1501,7 +1501,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1531,7 +1531,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; From 7abf38bf49fdd5218cba98fa40f8edca77f715c8 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 16:34:17 +0200 Subject: [PATCH 10/12] Bumped version for tests --- QminderAPI.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/QminderAPI.xcodeproj/project.pbxproj b/QminderAPI.xcodeproj/project.pbxproj index 0cbc70c..ba28188 100644 --- a/QminderAPI.xcodeproj/project.pbxproj +++ b/QminderAPI.xcodeproj/project.pbxproj @@ -1443,6 +1443,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = QminderAPITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1462,6 +1463,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = QminderAPITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 44c54ff6a4ab4122aa3879e0b223d7a22d615442 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 16:49:57 +0200 Subject: [PATCH 11/12] iPhone 15 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f923d35..3c9f3dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: xcode-version: '15.0.1' - name: Test on iOS - run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color + run: set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone 15 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build test | xcpretty --color env: QMINDER_LOCATION_ID: ${{ secrets.QMINDER_LOCATION_ID }} QMINDER_API_KEY: ${{ secrets.QMINDER_API_KEY }} From e87d5c64318cee72a97fe3aed0279b47118dc706 Mon Sep 17 00:00:00 2001 From: Siim Raud Date: Wed, 18 Dec 2024 18:03:37 +0200 Subject: [PATCH 12/12] Not linting the pod --- .github/workflows/build.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c9f3dc..b347ac5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,18 +38,6 @@ jobs: sudo gem install cocoapods --no-doc sudo gem cleanup - - name: Pod lib lint - run: pod lib lint --allow-warnings - - - name: action-slack - uses: 8398a7/action-slack@v2.2.0 - with: - status: ${{ job.status }} - author_name: GithubCI - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - build: name: Build on ${{ matrix.platform }} runs-on: macos-latest