From dde702768c816d84bfc853766e6d036a888da96d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:36:51 +0000 Subject: [PATCH 01/18] chore: migrate CI and docs to SPM Co-authored-by: muzahidul-opti <129880873+muzahidul-opti@users.noreply.github.com> --- .github/workflows/source_clear_cron.yml | 1 - .github/workflows/swift.yml | 29 +++-------- .github/workflows/unit_tests.yml | 55 +++++--------------- CLAUDE.md | 48 +++++++---------- CONTRIBUTING.md | 11 ++-- OptimizelySwiftSDK.podspec | 24 --------- OptimizelySwiftSDK.xcodeproj/project.pbxproj | 8 --- Package.swift | 2 +- Podfile | 42 --------------- README.md | 35 ++----------- Scripts/build_all.sh | 8 +-- Scripts/run_prep.sh | 11 +--- Scripts/run_release.sh | 26 --------- Scripts/run_unit_tests.sh | 5 +- Scripts/test_all.sh | 20 +++---- Scripts/update_version.sh | 24 +-------- 16 files changed, 67 insertions(+), 282 deletions(-) delete mode 100644 OptimizelySwiftSDK.podspec delete mode 100644 Podfile diff --git a/.github/workflows/source_clear_cron.yml b/.github/workflows/source_clear_cron.yml index 5c83bfa3c..4b37ecc15 100644 --- a/.github/workflows/source_clear_cron.yml +++ b/.github/workflows/source_clear_cron.yml @@ -16,5 +16,4 @@ jobs: env: SRCCLR_API_TOKEN: ${{ secrets.SRCCLR_API_TOKEN }} run: | - gem install cocoapods -v '1.15.2' curl -sSL https://download.sourceclear.com/ci.sh | bash -s - scan diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 9a442831b..6d0088702 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -30,31 +30,26 @@ jobs: secrets: CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} - lint: - runs-on: macos-14 + package_validation: + runs-on: xcode-27 + if: "${{ github.event.inputs.PREP == '' && github.event.inputs.RELEASE == '' }}" steps: - uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 15.3 - env: SRCCLR_API_TOKEN: ${{ secrets.SRCCLR_API_TOKEN }} run: | - gem install cocoapods -v '1.15.2' - pod spec lint --quick --allow-warnings + swift package resolve + swift build curl -sSL https://download.sourceclear.com/ci.sh | bash unittests: if: "${{ github.event.inputs.PREP == '' && github.event.inputs.RELEASE == '' }}" uses: optimizely/swift-sdk/.github/workflows/unit_tests.yml@master prepare_for_release: - runs-on: macos-14 + runs-on: xcode-27 if: "${{ github.event.inputs.PREP == 'true' && github.event_name == 'workflow_dispatch' }}" steps: - uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 15.3 - name: Install Hub by Homebrew run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -67,9 +62,7 @@ jobs: BRANCH: ${{ github.ref_name }} GITHUB_USER: optibot GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }} - COCOAPODS_VERSION: '1.15.2' run: | - gem install cocoapods -v $COCOAPODS_VERSION Scripts/run_prep.sh - name: Check prepare for release failure if: steps.prepare_for_release.conclusion == 'failure' @@ -77,24 +70,18 @@ jobs: release: if: "${{github.event.inputs.RELEASE == 'true' && github.event_name == 'workflow_dispatch' }}" - runs-on: macos-14 + runs-on: xcode-27 steps: - uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 15.3 - name: Install Hub by Homebrew run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" brew install hub - - name: Push to cocoapods.org + - name: Publish GitHub release env: HOME: 'home/runner' REPO_SLUG: ${{ github.repository }} BRANCH: ${{ github.ref_name }} GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }} - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} - COCOAPODS_VERSION: '1.15.2' run: | - gem install cocoapods -v $COCOAPODS_VERSION Scripts/run_release.sh diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 044062264..55cd76add 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -7,51 +7,37 @@ env: jobs: unittests: - runs-on: macos-14 + runs-on: xcode-27 strategy: fail-fast: false matrix: - # github actions are very poor in supporting iOS simulators: - # - multiple Xcode versions are pre installed (not all versions and they change supported xcode versions frequently) - # - each xcode version has own simulator os versions. - # - so to run tests with the target simulator, we have to find a proper xcode version pre-installed and support the target simulator os version. - # also, the xcode version (simulator_xcode_version) and simulator os versions (os) are moving target. We have to change these time to time. - # - see "https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md" for installed macOS, xcode and simulator versions. include: - - os: 17.2 - device: "iPhone 15" + - os: 27.0 + device: "iPhone 17" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" os_type: "iOS" - simulator_xcode_version: 15.3 - - os: 17.4 - device: "iPad Pro 11-inch (M4)" + - os: 27.0 + device: "iPad Pro 11-inch (M5)" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" os_type: "iOS" - simulator_xcode_version: 15.3 - - os: 18.2 - device: "iPhone 16" + - os: 27.0 + device: "iPhone 17 Pro" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" os_type: "iOS" - simulator_xcode_version: 15.3 - - os: 17.5 - device: "Apple TV" + - os: 27.0 + device: "Apple TV 4K (3rd generation)" scheme: "OptimizelySwiftSDK-tvOS" test_sdk: "appletvsimulator" platform: "tvOS Simulator" os_type: "tvOS" - simulator_xcode_version: 15.3 steps: - uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 - with: - # macos version and supported simulator_xcode_versions are all related to this xcode_version, so be careful when you upgrade this. - xcode-version: 15.3 - name: set SDK Branch if PR env: BASE_REF: ${{ github.base_ref }} @@ -71,25 +57,9 @@ jobs: PLATFORM: ${{ matrix.platform }} OS: ${{ matrix.os }} OS_TYPE: ${{ matrix.os_type }} - SIMULATOR_XCODE_VERSION: ${{ matrix.simulator_xcode_version }} NAME: ${{ matrix.device }} run: | gem install coveralls-lcov - gem install cocoapods -v '1.15.2' - pod repo update - pod install - HOMEBREW_NO_INSTALL_CLEANUP=true brew update && brew install jq - - # github actions are very poor in supporting iOS simulators: - # - to find pre-installed xcode version, run this: - ##ls /Applications/ - # - to find supported simulator os versions, run this (and find simulator with non-error "datapath") - # xcrun simctl list --json devices - - # switch to the target xcode version - sudo xcode-select -switch /Applications/Xcode_$SIMULATOR_XCODE_VERSION.app - - Scripts/prepare_simulator.sh Scripts/run_unit_tests.sh - name: Check on failures (Archive Test Results) uses: actions/upload-artifact@v4 @@ -97,11 +67,10 @@ jobs: with: name: build-logs-${{ matrix.device }}-${{ matrix.os }} path: build/Logs - - # - report coverage for PR and iPhone 16 only (avoid redundant ones) - # - use Xcode16+ (older Xcode reports a wrong number) - name: Check on success + # - report coverage for the main iPhone simulator job only (avoid redundant ones) + - name: Check on success id: coveralls - if: ${{ steps.unit_tests.outcome == 'success' && env.BRANCH == 'master' && env.PLATFORM == 'iOS Simulator' && env.NAME == 'iPhone 16' }} + if: ${{ steps.unit_tests.outcome == 'success' && env.BRANCH == 'master' && env.PLATFORM == 'iOS Simulator' && env.NAME == 'iPhone 17' }} env: PLATFORM: ${{ matrix.platform }} NAME: ${{ matrix.device }} diff --git a/CLAUDE.md b/CLAUDE.md index b9625ed58..a44253eea 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -12,22 +12,21 @@ This is the Optimizely Swift SDK for Feature Experimentation and Full Stack. It - Swift 5+ ### Installation Methods -- Swift Package Manager (preferred) -- CocoaPods +- Swift Package Manager ### Dependencies - SwiftLint (development) ### Initial Setup ```bash -# Install dependencies -pod install - # Build the SDK swift build # Verify setup (see "Testing" section for detailed commands) -swift test +xcodebuild test \ + -project OptimizelySwiftSDK.xcodeproj \ + -scheme OptimizelySwiftSDK-iOS \ + -destination 'platform=iOS Simulator,name=iPhone 17,OS=27.0' ``` ## Project Structure @@ -124,33 +123,33 @@ The SDK uses protocols for extensibility: #### Using Swift Package Manager ```bash -# Run all tests -swift test +# Resolve package dependencies +swift package resolve -# Run with verbose output -swift test --verbose +# Build the package +swift build ``` #### Using Xcode ```bash # Run all tests for iOS xcodebuild test \ - -workspace OptimizelySwiftSDK.xcworkspace \ + -project OptimizelySwiftSDK.xcodeproj \ -scheme OptimizelySwiftSDK-iOS \ - -destination 'platform=iOS Simulator,name=iPhone 16' + -destination 'platform=iOS Simulator,name=iPhone 17,OS=27.0' # Run a specific test target xcodebuild test \ - -workspace OptimizelySwiftSDK.xcworkspace \ + -project OptimizelySwiftSDK.xcodeproj \ -scheme OptimizelySwiftSDK-iOS \ - -destination 'platform=iOS Simulator,name=iPhone 16' \ + -destination 'platform=iOS Simulator,name=iPhone 17,OS=27.0' \ -only-testing:TestTarget/TestClass # Run a specific test method xcodebuild test \ - -workspace OptimizelySwiftSDK.xcworkspace \ + -project OptimizelySwiftSDK.xcodeproj \ -scheme OptimizelySwiftSDK-iOS \ - -destination 'platform=iOS Simulator,name=iPhone 16' \ + -destination 'platform=iOS Simulator,name=iPhone 17,OS=27.0' \ -only-testing:TestTarget/TestClass/testMethodName ``` @@ -186,7 +185,7 @@ Similar test targets exist for tvOS and other platforms. - Add PBXFileReference entry (~line 2640) - Add to file group listing (~line 3180) - Add to PBXSourcesBuildPhase for each target (~lines 5200, 5510) -4. Verify: `swift build && swift test --filter YourTestClass` +4. Verify with `xcodebuild test -project OptimizelySwiftSDK.xcodeproj -scheme OptimizelySwiftSDK-iOS -only-testing:YourTestTarget/YourTestClass -destination 'platform=iOS Simulator,name=iPhone 17,OS=27.0'` **Pattern**: Common tests need 2 targets (iOS + tvOS); base classes may need 4 targets. @@ -308,16 +307,10 @@ Month Day, Year - ✅ Include: New features, bug fixes, API changes, breaking changes - ❌ Exclude: Internal refactoring, test improvements, CI updates, documentation changes -**File 3: `README.md`** (Line ~42) -```diff --```pod 'OptimizelySwiftSDK', '~> 5.2.0'``` -+```pod 'OptimizelySwiftSDK', '~> 5.2.1'``` -``` - #### 4. Create Release Commit ```bash # Stage all changes -git add .github/workflows/swift.yml CHANGELOG.md README.md +git add .github/workflows/swift.yml CHANGELOG.md # Create release commit git commit -m "chore: prepare release X.Y.Z @@ -345,7 +338,7 @@ Prepare for Release X.Y.Z: [Brief description of changes] #### 6. After PR Merge After the release PR is merged to master: 1. Maintainers will tag the release -2. GitHub Actions will build and publish to CocoaPods +2. GitHub Actions will publish the GitHub release 3. Release notes will be published automatically ### Example Release PRs @@ -356,7 +349,6 @@ After the release PR is merged to master: - [ ] Created release branch: `prepare-release-X.Y.Z` - [ ] Updated VERSION in `.github/workflows/swift.yml` - [ ] Added release notes to `CHANGELOG.md` (user-facing changes only) -- [ ] Updated version in `README.md` - [ ] Created commit with message: `chore: prepare release X.Y.Z` - [ ] Created PR with proper title and description - [ ] All CI tests passing @@ -446,9 +438,9 @@ git merge origin/master xcrun simctl list devices available # List schemes and build targets -xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -list +xcodebuild -project OptimizelySwiftSDK.xcodeproj -list # Show build settings for a scheme -xcodebuild -workspace OptimizelySwiftSDK.xcworkspace \ +xcodebuild -project OptimizelySwiftSDK.xcodeproj \ -scheme OptimizelySwiftSDK-iOS -showBuildSettings ``` diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6ec7a174..3dbcad3e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,11 +7,12 @@ We welcome contributions and feedback! All contributors must sign our [Contribut 1. Create a branch off of `master`: `git checkout -b YOUR_NAME/branch_name`. 2. Commit your changes. We follow the [commit message guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines) from Angular. 3. Make sure to add tests! -4. Run Swift linter (TBD). -5. `git push` your changes to GitHub. -6. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `master`. -7. Open a pull request from `YOUR_NAME/branch_name` to `master`. -8. A repository maintainer will review your pull request and, if all goes well, squash and merge it! +4. Run `swift build` and SwiftLint. +5. Run the relevant `xcodebuild test -project OptimizelySwiftSDK.xcodeproj ...` commands for the platforms you changed. +6. `git push` your changes to GitHub. +7. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `master`. +8. Open a pull request from `YOUR_NAME/branch_name` to `master`. +9. A repository maintainer will review your pull request and, if all goes well, squash and merge it! ## Pull request acceptance criteria diff --git a/OptimizelySwiftSDK.podspec b/OptimizelySwiftSDK.podspec deleted file mode 100644 index 9a2ce143b..000000000 --- a/OptimizelySwiftSDK.podspec +++ /dev/null @@ -1,24 +0,0 @@ -Pod::Spec.new do |s| - s.name = "OptimizelySwiftSDK" - s.module_name = "Optimizely" - s.version = "5.5.0" - s.summary = "Optimizely experiment framework for iOS/tvOS/watchOS" - s.homepage = "https://docs.developers.optimizely.com/experimentation/v4.0.0-full-stack/docs" - s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } - s.author = { "Optimizely" => "support@optimizely.com" } - s.ios.deployment_target = "10.0" - s.tvos.deployment_target = "10.0" - s.osx.deployment_target = "10.14" - s.watchos.deployment_target = "3.0" - s.source = { - :git => "https://github.com/optimizely/swift-sdk.git", - :tag => "v"+s.version.to_s - } - s.source_files = "Sources/**/*.swift" - s.exclude_files = "CLAUDE.md" - s.resource_bundles = { 'OptimizelySwiftSDK' => ['Sources/Supporting Files/PrivacyInfo.xcprivacy'] } - s.swift_version = ["5.0", "5.1"] - s.framework = "Foundation" - s.requires_arc = true - s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" } -end diff --git a/OptimizelySwiftSDK.xcodeproj/project.pbxproj b/OptimizelySwiftSDK.xcodeproj/project.pbxproj index f36163d98..afa8037c6 100644 --- a/OptimizelySwiftSDK.xcodeproj/project.pbxproj +++ b/OptimizelySwiftSDK.xcodeproj/project.pbxproj @@ -2784,7 +2784,6 @@ 6E75165D22C520D400B2B157 /* Sources */, 6E75196022C5211100B2B157 /* Tests */, 0B7CB0C321AC5FE2007B77E5 /* Products */, - 5793E12CFD024A5E8594F535 /* Pods */, 87DE4DE091B80D1F13BBD781 /* Frameworks */, ); sourceTree = ""; @@ -2812,13 +2811,6 @@ name = Products; sourceTree = ""; }; - 5793E12CFD024A5E8594F535 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - path = Pods; - sourceTree = ""; - }; 6E14CD642423F80B00010234 /* OptimizelyTests-Batch-iOS */ = { isa = PBXGroup; children = ( diff --git a/Package.swift b/Package.swift index 502212557..8ca72ab0f 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,7 @@ let package = Package( .target( name: "Optimizely", path: "Sources", - exclude: ["CLAUDE.md"], + exclude: ["Supporting Files/Info.plist"], resources: [.copy("Supporting Files/PrivacyInfo.xcprivacy")] ) ], diff --git a/Podfile b/Podfile deleted file mode 100644 index ec7f5f386..000000000 --- a/Podfile +++ /dev/null @@ -1,42 +0,0 @@ -workspace 'OptimizelySwiftSDK.xcworkspace' - -def analytics_pods -# pod 'Amplitude-iOS' -# pod 'Google/Analytics' -# pod 'Localytics' -# pod 'Mixpanel-swift', '2.5.7' -end - -def linter_pods - # ignore all warnings from all dependencies - inhibit_all_warnings! - pod 'SwiftLint', '0.43.1' -end - -target 'DemoSwiftiOS' do - project 'DemoSwiftApp/DemoSwiftApp.xcodeproj/' - platform :ios, '10.0' - use_frameworks! - analytics_pods - linter_pods - #pod 'OptimizelySwiftSDK','3.0.0' -end - -target 'DemoSwifttvOS' do - project 'DemoSwiftApp/DemoSwiftApp.xcodeproj/' - platform :tvos, '10.0' - use_frameworks! - linter_pods - #pod 'OptimizelySwiftSDK','3.0.0' -end - -# Disable Code Coverage for Pods projects -post_install do |installer_representation| - installer_representation.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['CLANG_ENABLE_CODE_COVERAGE'] = 'NO' - end - end -end - - diff --git a/README.md b/README.md index 24a4ec773..41b8e8b64 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,7 @@ # Optimizely Swift SDK [![Apache 2.0](https://img.shields.io/github/license/nebula-plugins/gradle-extra-configurations-plugin.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/carthage/carthage) [![Build Status](https://github.com/optimizely/swift-sdk/actions/workflows/swift.yml/badge.svg?branch=master)](https://github.com/optimizely/swift-sdk/actions) [![Coverage Status](https://coveralls.io/repos/github/optimizely/swift-sdk/badge.svg?branch=master)](https://coveralls.io/github/optimizely/swift-sdk?branch=master) -[![Platforms](https://img.shields.io/cocoapods/p/OptimizelySwiftSDK.svg)](https://img.shields.io/cocoapods/p/OptimizelySwiftSDK.svg) -[![Podspec](https://img.shields.io/cocoapods/v/OptimizelySwiftSDK.svg)](https://cocoapods.org/pods/OptimizelySwiftSDK) This repository houses the Swift SDK for use with Optimizely Feature Experimentation and Optimizely Full Stack (legacy) for Mobile and OTT. @@ -28,7 +25,7 @@ Refer to the [Swift SDK's developer documentation](https://docs.developers.optim Please note below that _\_ is used to represent the platform on which you are building your app. Currently, we support ```iOS```, ```tvOS```, and ```watchOS``` platforms. #### Swift Package Manager -Add the dependency on the Optimizely Swift SDK with Swift Package Manager in `Xcode` +Add the dependency on the Optimizely Swift SDK with Swift Package Manager in `Xcode`. 1. `File` -> `Swift Packages` -> `Add Package Dependency` 2. Enter `https://github.com/optimizely/swift-sdk`. @@ -36,33 +33,11 @@ Add the dependency on the Optimizely Swift SDK with Swift Package Manager in `Xc If you have a name conflict with other swift packages when you add the Optimizely swift-sdk dependency to Xcode, you can also try with its aliased repo: "https://github.com/optimizely/optimizely-swift-sdk.git". -#### CocoaPods -1. Add the following lines to the _Podfile_:
-```use_frameworks!```
-```pod 'OptimizelySwiftSDK', '~> 5.5.0'```
-
+#### Migration note +CocoaPods support has been removed as part of the SDK's move to Swift Package Manager ahead of the ecosystem's end-of-2026 support sunset. -2. Run the following command: 
``` pod install ```
- -Further installation instructions for Cocoapods: https://guides.cocoapods.org/using/getting-started.html - -#### Carthage -1. Add the following lines to the _Cartfile_:
```github "optimizely/swift-sdk" ~> 4.1.0```
- -2. Run the following command:
```carthage update```
- -3. Link the frameworks to your project. Go to your project target's **Link Binary With Libraries** and drag over the following from the _Carthage/Build/\_ folder: 
```Optimizely.framework```
- -4. To ensure that proper bitcode-related files and dSYMs are copied when archiving your app, you will need to install a Carthage build script: - - Add a new **Run Script** phase in your target's **Build Phase**.
- - In the script area include:
-      ```/usr/local/bin/carthage copy-frameworks```
- - Add the frameworks to the **Input Files** list:
-      ```$(SRCROOT)/Carthage/Build//Optimizely.framework```
- - Add the paths to the copied frameworks to the Output Files list:
-      ```$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Optimizely.framework```
- -Futher installation instructions for Carthage: https://github.com/Carthage/Carthage +- Use Swift Package Manager for all new and existing integrations. +- The module name remains `Optimizely`, so existing `import Optimizely` statements do not change. ### Feature Management Access diff --git a/Scripts/build_all.sh b/Scripts/build_all.sh index f1fc8bdd0..c1d3d719f 100755 --- a/Scripts/build_all.sh +++ b/Scripts/build_all.sh @@ -30,10 +30,10 @@ main() { action="$1" fi; - xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -scheme OptimizelySwiftSDK-iOS -configuration Release "${action}" - xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -scheme OptimizelySwiftSDK-tvOS -configuration Release "${action}" - xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -scheme OptimizelySwiftSDK-macOS -configuration Release "${action}" - xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -scheme OptimizelySwiftSDK-watchOS -configuration Release "${action}" + xcodebuild -project OptimizelySwiftSDK.xcodeproj -scheme OptimizelySwiftSDK-iOS -configuration Release "${action}" + xcodebuild -project OptimizelySwiftSDK.xcodeproj -scheme OptimizelySwiftSDK-tvOS -configuration Release "${action}" + xcodebuild -project OptimizelySwiftSDK.xcodeproj -scheme OptimizelySwiftSDK-macOS -configuration Release "${action}" + xcodebuild -project OptimizelySwiftSDK.xcodeproj -scheme OptimizelySwiftSDK-watchOS -configuration Release "${action}" } main diff --git a/Scripts/run_prep.sh b/Scripts/run_prep.sh index cf985c172..264251d03 100755 --- a/Scripts/run_prep.sh +++ b/Scripts/run_prep.sh @@ -39,20 +39,11 @@ function do_stuff { trap "kill $!" EXIT trap 'error_handler' ERR - # we need pod install or test_all.sh fails - # we skip "test_all.sh" until we have a good reason to repeat it heere # 1. this test takes long and also flaky tests can interrupt release process # 2. this "test_all.sh" is supposed to pass before starting pre-release # 3. prep auto PRs will be tested in CI/CD before starting release process. - # - cocoapods requires ENV['HOME'] with absolute path - # - # HOME=$(pwd) - # gem install cocoapods -v $COCOAPODS_VERSION - # pod _${COCOAPODS_VERSION}_ repo update - # pod _${COCOAPODS_VERSION}_ install - # # myscripts=( "update_version.sh ${VERSION}" "build_all.sh" "test_all.sh" ) myscripts=( "update_version.sh ${VERSION}" "build_all.sh" ) @@ -99,7 +90,7 @@ END PR_URL=$(hub pull-request -b ${BRANCH} -h ${AUTOBRANCH} -m "${MESSAGE}") echo -e "${COLOR_CYAN}ATTENTION:${COLOR_RESET} review and merge ${COLOR_CYAN}${PR_URL}${COLOR_RESET}" - echo "then to release to cocoapods use Git action's Trigger build with the following payload:" + echo "then to publish the GitHub release use Git action's Trigger build with the following payload:" echo -e "${COLOR_MAGENTA}env:${COLOR_RESET}" echo -e "${COLOR_MAGENTA} - RELEASE=true${COLOR_RESET}" } diff --git a/Scripts/run_release.sh b/Scripts/run_release.sh index de6f1a871..44b88ed8e 100755 --- a/Scripts/run_release.sh +++ b/Scripts/run_release.sh @@ -5,8 +5,6 @@ set -e # GITHUB_TOKEN - github api token with repo permissions (display value in build log setting: OFF) # GITHUB_USER - github username that GITHUB_TOKEN is associated with (display value in build log setting: ON) -# COCOAPODS_TRUNK_TOKEN - should be defined in job settings so that we can `pod trunk push` - MYREPO=${HOME}/workdir/${REPO_SLUG} function prep_workspace { @@ -41,33 +39,9 @@ function release_github { hub release create v${VERSION} -m "Release ${VERSION}" -m "${DESCRIPTION}" -t "${BRANCH}" } -function release_cocoapods { - - # - cocoapods requires ENV['HOME'] with absolute path - HOME=$(pwd) - gem install cocoapods -v $COCOAPODS_VERSION - - # ---- Optimizely's pods ---- - pods=(OptimizelySwiftSDK); - number_pods=${#pods[@]}; - - # ---- push podspecs to cocoapods ---- - # The podspecs need to be pushed in the correct order because of dependencies! - printf "\n\nPushing podspecs to COCOAPODS.ORG .\n"; - for (( i = 0; i < ${number_pods}; i++ )); - do - podname=${pods[i]}; - printf "Pushing the ${podname} pod to COCOAPODS.ORG .\n" - pod _${COCOAPODS_VERSION}_ trunk push --allow-warnings ${podname}.podspec - pod _${COCOAPODS_VERSION}_ update - done - -} - function main { prep_workspace release_github - release_cocoapods } main diff --git a/Scripts/run_unit_tests.sh b/Scripts/run_unit_tests.sh index 4541b6548..731b0cead 100755 --- a/Scripts/run_unit_tests.sh +++ b/Scripts/run_unit_tests.sh @@ -1,4 +1,5 @@ -#!/bin/bash -e +#!/bin/bash +set -euo pipefail # run xcode unit tests # @@ -9,5 +10,5 @@ # unit tests for PR only if [[ "$BRANCH" == "master" ]] then - xcodebuild test -derivedDataPath $COVERAGE_DIR -workspace OptimizelySwiftSDK.xcworkspace -scheme $SCHEME -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk $TEST_SDK -destination "platform=$PLATFORM,OS=$OS,name=$NAME" ONLY_ACTIVE_ARCH=YES | tee buildoutput | xcpretty && test ${PIPESTATUS[0]} -eq 0 + xcodebuild test -derivedDataPath "$COVERAGE_DIR" -project OptimizelySwiftSDK.xcodeproj -scheme "$SCHEME" -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk "$TEST_SDK" -destination "platform=$PLATFORM,OS=$OS,name=$NAME" ONLY_ACTIVE_ARCH=YES | tee buildoutput fi diff --git a/Scripts/test_all.sh b/Scripts/test_all.sh index 1833f8227..b80d30c48 100755 --- a/Scripts/test_all.sh +++ b/Scripts/test_all.sh @@ -1,25 +1,17 @@ - #!/bin/bash -e -# Since github actions only provides limit simulators with each xcode, we need to link simulators from other versions of xcode to be used by current xcode. -# We must use old simulators with current xcode since older xcode versions do not support swift 5 which is required by Swift SDK. -# More about XCode and its compatible simulators can be found here: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md -# https://github.com/actions/virtual-environments/issues/551 +# Run the project test matrix against the simulators bundled with the selected Xcode image. -deviceModels=("iPhone 12" "iPhone 8" "iPad Air (4th generation)" "Apple TV") -osVersions=("16.0" "14.4" "15.0" "16.0") -xcodeVersions=("14.3" "14.3" "14.3" "14.3") -platforms=("iOS" "iOS" "iOS" "tvOS") -testSdks=("iphonesimulator" "iphonesimulator" "iphonesimulator" "appletvsimulator") +deviceModels=("iPhone 17" "iPad Pro 11-inch (M5)" "Apple TV 4K (3rd generation)") +osVersions=("27.0" "27.0" "27.0") +platforms=("iOS" "iOS" "tvOS") +testSdks=("iphonesimulator" "iphonesimulator" "appletvsimulator") for i in "${!deviceModels[@]}"; do export PLATFORM="${platforms[$i]} Simulator" export OS="${osVersions[$i]}" export NAME="${deviceModels[$i]}" export OS_TYPE="${platforms[$i]}" - export SIMULATOR_XCODE_VERSION="${xcodeVersions[$i]}" - - Scripts/prepare_simulator.sh echo "Testing OptimizelySwiftSDK-${platforms[$i]} (${deviceModels[$i]},OS=${osVersions[$i]})" - xcrun xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -scheme "OptimizelySwiftSDK-${platforms[$i]}" -sdk "${testSdks[$i]}" -configuration Release -destination "platform=${platforms[$i]} Simulator,name=${deviceModels[$i]},OS=${osVersions[$i]}" test + xcrun xcodebuild -project OptimizelySwiftSDK.xcodeproj -scheme "OptimizelySwiftSDK-${platforms[$i]}" -sdk "${testSdks[$i]}" -configuration Release -destination "platform=${platforms[$i]} Simulator,name=${deviceModels[$i]},OS=${osVersions[$i]}" test done diff --git a/Scripts/update_version.sh b/Scripts/update_version.sh index 8829b4684..bc0f6a248 100755 --- a/Scripts/update_version.sh +++ b/Scripts/update_version.sh @@ -2,9 +2,7 @@ # update_version.sh # -# This script consistently updates the SDK version numbers in several places: -# 1. {XcodeProject}/OptimizelySDK/Utils/SDKVersion.swift -# 2. {XcodeProject}.podspec +# This script consistently updates the SDK version number in the SDK source. # # Usage: # $ ./update_version.sh [releaseSDKVersion] @@ -51,24 +49,4 @@ else fi -#---------------------------------------------------------------------------------- -# 2. update the SDK version in all podspecs -#---------------------------------------------------------------------------------- -printf "\n\nReplacing all versions in *.podspec files\n" - -curPodSpec="OptimizelySwiftSDK.podspec" - -printf "\t[${curPodSpec}] Updating podspec to ${releaseSDKVersion}.\n" -sed -i '' -e "s/\(s\.version[ ]*\)=[ ]*\".*\"/\1= \"${releaseSDKVersion}\"/g" ${curPodSpec} - -# pod-spec-lint cannot be run here due to dependency issues -# all podspecs will be validated anyway when uploading to CocoaPods repo - -printf "Verifying *.podspec files\n" - -vm=$(sed -n "s/s\.version.*=.*\"\(.*\)\"/\1/p" ${curPodSpec} | sed "s/ //g" ) -if [ "${vm}" == "${releaseSDKVersion}" ]; then - printf "\t[${curPodSpec}] Verified podspec: ${vm} === ${releaseSDKVersion}\n" -fi - printf "\n\n[SUCCESS] All release-sdk-version settings have been updated successfully!\n\n\n" From 96984233924b07f284882705ccbb687218075cc8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:37:25 +0000 Subject: [PATCH 02/18] chore: clean remaining SPM migration config Co-authored-by: muzahidul-opti <129880873+muzahidul-opti@users.noreply.github.com> --- .swiftlint.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index bf4fdb8c9..1eb8509c5 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -9,8 +9,6 @@ disabled_rules: opt_in_rules: - empty_string excluded: -- Carthage -- Pods - SwiftLint/Common/3rdPartyLib - Tests line_length: From e8efffda4a45ce691d0b77708260c308e67b3d35 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:38:12 +0000 Subject: [PATCH 03/18] chore: tighten workflow token permissions Co-authored-by: muzahidul-opti <129880873+muzahidul-opti@users.noreply.github.com> --- .github/workflows/swift.yml | 3 +++ .github/workflows/unit_tests.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 6d0088702..e76f723a9 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,6 +16,9 @@ on: type: boolean description: release +permissions: + contents: read + env: VERSION: 5.5.0 diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 55cd76add..444097ab5 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -2,6 +2,9 @@ name: Reusable action of Unit tests on: [workflow_call] +permissions: + contents: read + env: COVERAGE_DIR: ./COVERAGE From 052e0de6a1579dffe2e78f84b7f60ce689f0c157 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 25 Sep 2026 22:07:20 +0600 Subject: [PATCH 04/18] chore: finish CocoaPods removal (FSSDK-11920) - Delete OptimizelySwiftSDK.xcworkspace (pod-integration artifact; demo app subprojects the SDK xcodeproj directly). Move IDETemplateMacros.plist to OptimizelySwiftSDK.xcodeproj/xcshareddata so Xcode keeps the file-header template. - De-pod DemoSwiftApp: drop Pods xcconfigs, Pods framework links, manifest-lock phases; repoint lint phases from \${PODS_ROOT}/SwiftLint to brew swiftlint. - Delete orphaned Scripts/prepare_simulator.sh (no callers left). - .gitignore: drop CocoaPods section; CONTRIBUTING: document swiftlint install. Co-Authored-By: Claude Code --- .gitignore | 11 --- CONTRIBUTING.md | 2 +- .../DemoSwiftApp.xcodeproj/project.pbxproj | 80 +----------------- .../xcshareddata/IDETemplateMacros.plist | 0 .../contents.xcworkspacedata | 19 ----- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -- .../xcshareddata/WorkspaceSettings.xcsettings | 8 -- Scripts/prepare_simulator.sh | 84 ------------------- 8 files changed, 4 insertions(+), 208 deletions(-) rename {OptimizelySwiftSDK.xcworkspace => OptimizelySwiftSDK.xcodeproj}/xcshareddata/IDETemplateMacros.plist (100%) delete mode 100644 OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata delete mode 100644 OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100755 Scripts/prepare_simulator.sh diff --git a/.gitignore b/.gitignore index bd26a434d..620edc520 100644 --- a/.gitignore +++ b/.gitignore @@ -38,17 +38,6 @@ build !*.xcodeproj/xcshareddata/ !*.xcworkspace/contents.xcworkspacedata -# CocoaPods -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -Pods/ - -# COCOAPODS version at the end of Podfile.lock requires all stick to the same version -# Ignore this and stick pods to fixed versions in Podfile -Podfile.lock - # Carthage # # Add this line if you want to avoid checking in source code from Carthage dependencies. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3dbcad3e1..f8cad4069 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ We welcome contributions and feedback! All contributors must sign our [Contribut 1. Create a branch off of `master`: `git checkout -b YOUR_NAME/branch_name`. 2. Commit your changes. We follow the [commit message guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines) from Angular. 3. Make sure to add tests! -4. Run `swift build` and SwiftLint. +4. Run `swift build` and SwiftLint ([install via Homebrew](https://github.com/realm/SwiftLint#installation): `brew install swiftlint`). 5. Run the relevant `xcodebuild test -project OptimizelySwiftSDK.xcodeproj ...` commands for the platforms you changed. 6. `git push` your changes to GitHub. 7. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `master`. diff --git a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj index c3316049b..99f30acae 100644 --- a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj +++ b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 25C6F3B721C95D1800C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; }; 25C6F3BC21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; }; 25C6F3BD21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; }; - 5015D17687408F548F31F1A6 /* Pods_DemoSwifttvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCC404BE4046CDA1D3A9C26B /* Pods_DemoSwifttvOS.framework */; }; 6E4D2FDF22C5455400062EB3 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4D2FC822C5454400062EB3 /* Optimizely.framework */; }; 6E4D2FE022C5455400062EB3 /* Optimizely.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4D2FC822C5454400062EB3 /* Optimizely.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 6E4D2FE322C5456700062EB3 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4D2FCA22C5454400062EB3 /* Optimizely.framework */; }; @@ -38,7 +37,6 @@ 75C71C6925E45A980084187E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75C71C6825E45A980084187E /* Assets.xcassets */; }; 75C71C8825E45B5C0084187E /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75C71C8125E45A980084187E /* Optimizely.framework */; }; 75C71C8925E45B5C0084187E /* Optimizely.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 75C71C8125E45A980084187E /* Optimizely.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 75F4CCC60342B5ECEE4A706D /* Pods_DemoSwiftiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B886F5E161647DB427A8FBC /* Pods_DemoSwiftiOS.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -232,7 +230,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0B886F5E161647DB427A8FBC /* Pods_DemoSwiftiOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoSwiftiOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 252D7DED21C8800800134A7A /* DemoSwiftiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoSwiftiOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 252D7E1121C8804E00134A7A /* DemoSwifttvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoSwifttvOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6E4D2FB822C5454400062EB3 /* OptimizelySwiftSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OptimizelySwiftSDK.xcodeproj; path = ../OptimizelySwiftSDK.xcodeproj; sourceTree = ""; }; @@ -253,16 +250,11 @@ 75C71C6425E45A980084187E /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = ""; }; 75C71C6825E45A980084187E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 75C71C6A25E45A980084187E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9C185BE70FBE51067CFD104E /* Pods-DemoSwiftiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwiftiOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwiftiOS/Pods-DemoSwiftiOS.release.xcconfig"; sourceTree = ""; }; - B301A636D5072557B288E62C /* Pods-DemoSwifttvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwifttvOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwifttvOS/Pods-DemoSwifttvOS.release.xcconfig"; sourceTree = ""; }; - CCC404BE4046CDA1D3A9C26B /* Pods_DemoSwifttvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoSwifttvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E4A4D2A6EBCC93081556F7A5 /* Pods-DemoSwiftiOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwiftiOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwiftiOS/Pods-DemoSwiftiOS.debug.xcconfig"; sourceTree = ""; }; EA299ED81E5530B800931399 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EA299EDE1E55312200931399 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/iOSMain.storyboard; sourceTree = ""; }; EA299EE21E55313B00931399 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; EA299EE51E55313B00931399 /* VariationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VariationViewController.swift; sourceTree = ""; }; EA5246CC1DC7186800AF6685 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - FD873EDFB92782C5D1947834 /* Pods-DemoSwifttvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwifttvOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwifttvOS/Pods-DemoSwifttvOS.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -271,7 +263,6 @@ buildActionMask = 2147483647; files = ( 6E4D2FDF22C5455400062EB3 /* Optimizely.framework in Frameworks */, - 75F4CCC60342B5ECEE4A706D /* Pods_DemoSwiftiOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -280,7 +271,6 @@ buildActionMask = 2147483647; files = ( 6E4D2FE322C5456700062EB3 /* Optimizely.framework in Frameworks */, - 5015D17687408F548F31F1A6 /* Pods_DemoSwifttvOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -302,17 +292,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5D9DAC78D3124F03BF2A7CC8 /* Pods */ = { - isa = PBXGroup; - children = ( - E4A4D2A6EBCC93081556F7A5 /* Pods-DemoSwiftiOS.debug.xcconfig */, - 9C185BE70FBE51067CFD104E /* Pods-DemoSwiftiOS.release.xcconfig */, - FD873EDFB92782C5D1947834 /* Pods-DemoSwifttvOS.debug.xcconfig */, - B301A636D5072557B288E62C /* Pods-DemoSwifttvOS.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; 6E4D2FB922C5454400062EB3 /* Products */ = { isa = PBXGroup; children = ( @@ -432,7 +411,6 @@ 75C71C6125E45A980084187E /* DemoSwiftwatchOS WatchKit Extension */, EA5246BE1DC7186800AF6685 /* Products */, EA5248C31DC72E8300AF6685 /* Frameworks */, - 5D9DAC78D3124F03BF2A7CC8 /* Pods */, ); sourceTree = ""; }; @@ -460,9 +438,7 @@ isa = PBXGroup; children = ( 6E4D2FB822C5454400062EB3 /* OptimizelySwiftSDK.xcodeproj */, - 0B886F5E161647DB427A8FBC /* Pods_DemoSwiftiOS.framework */, - CCC404BE4046CDA1D3A9C26B /* Pods_DemoSwifttvOS.framework */, - ); + ); name = Frameworks; sourceTree = ""; }; @@ -473,7 +449,6 @@ isa = PBXNativeTarget; buildConfigurationList = 252D7E0721C8800900134A7A /* Build configuration list for PBXNativeTarget "DemoSwiftiOS" */; buildPhases = ( - 8C29F1E0722378268CBB6EF1 /* [CP] Check Pods Manifest.lock */, 252D7DE921C8800800134A7A /* Sources */, 252D7DEA21C8800800134A7A /* Frameworks */, 252D7DEB21C8800800134A7A /* Resources */, @@ -494,7 +469,6 @@ isa = PBXNativeTarget; buildConfigurationList = 252D7E2821C8805000134A7A /* Build configuration list for PBXNativeTarget "DemoSwifttvOS" */; buildPhases = ( - 3113BA42DAEFB72BCAE11952 /* [CP] Check Pods Manifest.lock */, 252D7E0D21C8804E00134A7A /* Sources */, 252D7E0E21C8804E00134A7A /* Frameworks */, 252D7E0F21C8804E00134A7A /* Resources */, @@ -776,28 +750,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3113BA42DAEFB72BCAE11952 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-DemoSwifttvOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; 6E88579122C6B77500EAE70C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -813,7 +765,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --config ${SOURCE_ROOT}/../.swiftlint.yml --path ${SOURCE_ROOT}/../Sources\n"; + shellScript = "if command -v swiftlint >/dev/null 2>&1; then swiftlint --config ${SOURCE_ROOT}/../.swiftlint.yml --path ${SOURCE_ROOT}/../Sources; else echo \"warning: SwiftLint not installed (brew install swiftlint); skipping lint\"; fi\n"; }; 6E8857A822C6B79D00EAE70C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -830,29 +782,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --config ${SOURCE_ROOT}/../.swiftlint.yml --path ${SOURCE_ROOT}/../Sources\n"; - }; - 8C29F1E0722378268CBB6EF1 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-DemoSwiftiOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; + shellScript = "if command -v swiftlint >/dev/null 2>&1; then swiftlint --config ${SOURCE_ROOT}/../.swiftlint.yml --path ${SOURCE_ROOT}/../Sources; else echo \"warning: SwiftLint not installed (brew install swiftlint); skipping lint\"; fi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -943,7 +873,6 @@ /* Begin XCBuildConfiguration section */ 252D7E0821C8800900134A7A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E4A4D2A6EBCC93081556F7A5 /* Pods-DemoSwiftiOS.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -974,7 +903,6 @@ }; 252D7E0921C8800900134A7A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9C185BE70FBE51067CFD104E /* Pods-DemoSwiftiOS.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -1000,7 +928,6 @@ }; 252D7E2921C8805000134A7A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FD873EDFB92782C5D1947834 /* Pods-DemoSwifttvOS.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; @@ -1028,7 +955,6 @@ }; 252D7E2A21C8805000134A7A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B301A636D5072557B288E62C /* Pods-DemoSwifttvOS.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; diff --git a/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDETemplateMacros.plist b/OptimizelySwiftSDK.xcodeproj/xcshareddata/IDETemplateMacros.plist similarity index 100% rename from OptimizelySwiftSDK.xcworkspace/xcshareddata/IDETemplateMacros.plist rename to OptimizelySwiftSDK.xcodeproj/xcshareddata/IDETemplateMacros.plist diff --git a/OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata b/OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 9fd401440..000000000 --- a/OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5e..000000000 --- a/OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/Scripts/prepare_simulator.sh b/Scripts/prepare_simulator.sh deleted file mode 100755 index cd51f454c..000000000 --- a/Scripts/prepare_simulator.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -e -set -eou pipefail - -# expects the following environment variables defined -# PLATFORM (eg. iOS Simulator) -# OS (eg. 12.0) -# NAME (eg. iPad Air) -# OS_TYPE (eg. iOS) -# SIMULATOR_XCODE_VERSION (Which Xcode's simulator to use) -# Since github actions only provides limit simulators with each xcode, we need to link simulators from other versions of xcode to be used by current xcode. -# We must use old simulators with current xcode since older xcode versions do not support swift 5 which is required by Swift SDK. -# More about XCode and its compatible simulators can be found here: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md -# https://github.com/actions/virtual-environments/issues/551 - -# Older than Xcode 12 (12.4?) has different paths -MAJOR_SIMULATOR_XCODE_VERSION=$(echo $SIMULATOR_XCODE_VERSION | cut -d. -f1) -if [ "$MAJOR_SIMULATOR_XCODE_VERSION" -lt 12 ]; then - os_folder="iPhoneOS" - os="${OS/./-}" - name="${NAME//[ ()]/-}" - - sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes - - # Check if device is Apple tv, update os_folder for linking purposes - if [[ "$NAME" = "Apple TV"* ]] - then - name="${name}-1080p" - os_folder="AppleTVOS" - fi - - # update os_folder as per xcode version - if [ "$SIMULATOR_XCODE_VERSION" == 10.3 ] - then - os_folder="${os_folder}.platform/Developer/Library" - else - os_folder="${os_folder}.platform/Library/Developer" - fi - - # Link and create simulators from older xcode versions which are not part of the current xcode version - sudo ln -s /Applications/Xcode_$SIMULATOR_XCODE_VERSION.app/Contents/Developer/Platforms/$os_folder/CoreSimulator/Profiles/Runtimes/$OS_TYPE.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/$OS_TYPE\ $OS.simruntime - xcrun simctl create "custom-device" "com.apple.CoreSimulator.SimDeviceType.$name" "com.apple.CoreSimulator.SimRuntime.$OS_TYPE-$os" - CUSTOM_SIMULATOR="$(instruments -s devices | grep -m 1 'custom-device' | awk -F'[][]' '{print $2}')" -else - # For Xcode 16+, try multiple runtime key formats - # The runtime key format has changed over Xcode versions - RUNTIME_KEY1="com.apple.CoreSimulator.SimRuntime.${PLATFORM/ Simulator/}-${OS/./-}" - RUNTIME_KEY2="${PLATFORM/ Simulator/}-${OS/./-}" - - # echo "Attempting to find simulator: $NAME with OS: $OS" - # echo "Runtime key 1: $RUNTIME_KEY1" - # echo "Runtime key 2: $RUNTIME_KEY2" - - # List all available devices for debugging - # echo "Available device runtimes:" - # xcrun simctl list --json devices | jq -r '.devices | keys[]' - - # Try format 1: com.apple.CoreSimulator.SimRuntime.iOS-XX-X - echo ".devices.\"$RUNTIME_KEY1\"" > /tmp/jq_file - CUSTOM_SIMULATOR=$( xcrun simctl list --json devices | jq -f /tmp/jq_file 2>/dev/null | jq -r '.[]? | select(.name==env.NAME) | .udid' || echo "" ) - - # If not found, try format 2: iOS-XX-X - if [ -z "$CUSTOM_SIMULATOR" ]; then - echo "Trying alternative runtime key format..." - echo ".devices.\"$RUNTIME_KEY2\"" > /tmp/jq_file - CUSTOM_SIMULATOR=$( xcrun simctl list --json devices | jq -f /tmp/jq_file 2>/dev/null | jq -r '.[]? | select(.name==env.NAME) | .udid' || echo "" ) - fi - - # If still not found, search all runtimes - if [ -z "$CUSTOM_SIMULATOR" ]; then - echo "Searching all runtimes for device: $NAME" - CUSTOM_SIMULATOR=$( xcrun simctl list --json devices | jq -r --arg os "$OS" --arg name "$NAME" '.devices | to_entries[] | select(.key | contains($os)) | .value[] | select(.name==$name) | .udid' | head -n 1 ) - fi - - if [ -z "$CUSTOM_SIMULATOR" ]; then - echo "ERROR: Could not find simulator '$NAME' with OS version $OS" - echo "Available devices:" - xcrun simctl list devices available - exit 1 - fi - - echo "Found simulator: $CUSTOM_SIMULATOR" -fi -xcrun simctl boot $CUSTOM_SIMULATOR && sleep 30 -xcrun simctl list | grep Booted From 198f23595dfbbf96cc8917b8520daafa1795840f Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 25 Sep 2026 22:14:13 +0600 Subject: [PATCH 05/18] chore: raise deployment targets to Xcode 27 minimums (FSSDK-11920) Xcode 27 refuses to build deployment targets below iOS/tvOS 15, watchOS 8, macOS 12 (xcodebuild errors out; SPM toolchain deprecates the same floors). Bump pbxproj (30 iOS + 18 tvOS + 4 watchOS + 2 macOS lines), Package.swift platforms, and swift-tools-version 5.3 -> 6.4 (required for .iOS(.v15)/.macOS(.v12) enums). Update README/CLAUDE.md platform support notes. Verified: xcodebuild iOS scheme BUILD SUCCEEDED on iPhone 17 / OS 27.0 simulator; swift build + swift package resolve pass. Co-Authored-By: Claude Code --- CLAUDE.md | 6 +- OptimizelySwiftSDK.xcodeproj/project.pbxproj | 100 +++++++++---------- Package.swift | 10 +- README.md | 2 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index a44253eea..97a7527e7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -6,9 +6,9 @@ This is the Optimizely Swift SDK for Feature Experimentation and Full Stack. It ## Getting Started ### Platform Support -- iOS 10.0+ -- tvOS 10.0+ -- watchOS 3.0+ +- iOS 15.0+ +- tvOS 15.0+ +- watchOS 8.0+ - Swift 5+ ### Installation Methods diff --git a/OptimizelySwiftSDK.xcodeproj/project.pbxproj b/OptimizelySwiftSDK.xcodeproj/project.pbxproj index afa8037c6..64db0eed2 100644 --- a/OptimizelySwiftSDK.xcodeproj/project.pbxproj +++ b/OptimizelySwiftSDK.xcodeproj/project.pbxproj @@ -6371,7 +6371,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -6435,7 +6435,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -6455,7 +6455,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6474,7 +6474,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6493,7 +6493,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = D3Q4WJTK93; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6503,7 +6503,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6513,7 +6513,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = D3Q4WJTK93; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6523,7 +6523,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6551,7 +6551,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6579,7 +6579,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6589,7 +6589,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6600,7 +6600,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6610,7 +6610,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6621,7 +6621,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6631,7 +6631,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6651,7 +6651,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6669,7 +6669,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6687,7 +6687,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6705,7 +6705,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6716,7 +6716,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6725,7 +6725,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6736,7 +6736,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6745,7 +6745,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6756,7 +6756,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6765,7 +6765,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6776,7 +6776,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6785,7 +6785,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6795,7 +6795,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6804,7 +6804,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6814,7 +6814,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6823,7 +6823,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6841,7 +6841,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6859,7 +6859,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6877,7 +6877,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6895,7 +6895,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6906,7 +6906,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -6915,7 +6915,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6926,7 +6926,7 @@ SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -6943,7 +6943,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6971,7 +6971,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6992,7 +6992,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7002,7 +7002,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -7012,7 +7012,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7022,7 +7022,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -7050,7 +7050,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Debug; }; @@ -7078,7 +7078,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Release; }; @@ -7097,13 +7097,13 @@ INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDK; PRODUCT_NAME = Optimizely; SDKROOT = macosx; @@ -7129,13 +7129,13 @@ INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INFOPLIST_OUTPUT_FORMAT = "same-as-input"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDK; PRODUCT_NAME = Optimizely; SDKROOT = macosx; diff --git a/Package.swift b/Package.swift index 8ca72ab0f..a70f2fa9e 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:6.4 // The Swift tools version declares the version of the PackageDescription library, // the minimum version of the Swift tools and Swift language compatibility version to process the manifest, // and the minimum version of the Swift tools that are needed to use the Swift package. @@ -8,10 +8,10 @@ import PackageDescription let package = Package( name: "Optimizely", platforms: [ - .iOS(.v10), - .tvOS(.v10), - .macOS(.v10_14), - .watchOS(.v3) + .iOS(.v15), + .tvOS(.v15), + .macOS(.v12), + .watchOS(.v8) ], products: [ .library(name: "Optimizely", diff --git a/README.md b/README.md index 41b8e8b64..b14bb40f0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Optimizely Rollouts is [free feature flags](https://www.optimizely.com/free-feat Refer to the [Swift SDK's developer documentation](https://docs.developers.optimizely.com/experimentation/v4.0.0-full-stack/docs/swift-sdk) for detailed instructions on getting started with using the SDK. ### Requirements -* iOS 10.0+ / tvOS 10.0+ / watchOS 3.0+ +* iOS 15.0+ / tvOS 15.0+ / watchOS 8.0+ / macOS 12.0+ * Swift 5+ ### Install the SDK From a2f9789e7778e573844621f4b9ed4db24e29248b Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 25 Sep 2026 22:22:25 +0600 Subject: [PATCH 06/18] chore: raise DemoSwiftApp deployment targets to Xcode 27 minimums (FSSDK-11920) Same floor as the SDK project: iOS/tvOS 15.0, watchOS 8.0 (was 10.0/6.0/3.0). Verified: DemoSwiftiOS BUILD SUCCEEDED on iPhone 17 / OS 27.0 simulator. Co-Authored-By: Claude Code --- .../DemoSwiftApp.xcodeproj/project.pbxproj | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj index 99f30acae..d0326f9d5 100644 --- a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj +++ b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj @@ -1003,7 +1003,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Debug; }; @@ -1030,7 +1030,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Release; }; @@ -1060,7 +1060,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Debug; }; @@ -1085,7 +1085,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Release; }; @@ -1146,7 +1146,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1154,8 +1154,8 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + TVOS_DEPLOYMENT_TARGET = 15.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Debug; }; @@ -1207,15 +1207,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 15.0; VALIDATE_PRODUCT = YES; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 8.0; }; name = Release; }; From 7d7431f133b5493ac64baabde4d7fb264fc3dac1 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 25 Sep 2026 23:43:07 +0600 Subject: [PATCH 07/18] chore: restore xcworkspace without Pods/podspec refs (FSSDK-11920) Keep OptimizelySwiftSDK.xcworkspace so the SDK and DemoSwiftApp targets open together in one Xcode window; drop only the dead refs (Pods project and deleted podspec). IDETemplateMacros.plist returns to the workspace's xcshareddata. Verified: xcodebuild -workspace -list shows all SDK + demo schemes. Co-Authored-By: Claude Code --- .../contents.xcworkspacedata | 13 +++++++++++++ .../xcshareddata/IDETemplateMacros.plist | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++++++++ 4 files changed, 29 insertions(+) create mode 100644 OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata rename {OptimizelySwiftSDK.xcodeproj => OptimizelySwiftSDK.xcworkspace}/xcshareddata/IDETemplateMacros.plist (100%) create mode 100644 OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata b/OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..31c755404 --- /dev/null +++ b/OptimizelySwiftSDK.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/OptimizelySwiftSDK.xcodeproj/xcshareddata/IDETemplateMacros.plist b/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDETemplateMacros.plist similarity index 100% rename from OptimizelySwiftSDK.xcodeproj/xcshareddata/IDETemplateMacros.plist rename to OptimizelySwiftSDK.xcworkspace/xcshareddata/IDETemplateMacros.plist diff --git a/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/OptimizelySwiftSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..f9b0d7c5e --- /dev/null +++ b/OptimizelySwiftSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + From 9024db220f5ca6f547a9b46bbc9f76000162d7f5 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 25 Sep 2026 23:49:09 +0600 Subject: [PATCH 08/18] chore: fix whitespace in demo pbxproj left by Pods-group removal (FSSDK-11920) Co-Authored-By: Claude Code --- DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj index d0326f9d5..cd615c63b 100644 --- a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj +++ b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj @@ -438,7 +438,7 @@ isa = PBXGroup; children = ( 6E4D2FB822C5454400062EB3 /* OptimizelySwiftSDK.xcodeproj */, - ); + ); name = Frameworks; sourceTree = ""; }; From 196ea05d97b49539b8b90d528f208a55112d879d Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 25 Sep 2026 23:56:14 +0600 Subject: [PATCH 09/18] fix: migrate demo app to UIScene life cycle for iOS/tvOS 27 (FSSDK-11920) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apps linked against the iOS 27 SDK crash at launch with "UIScene life cycle is required" when they still use the legacy UIApplicationDelegate window pattern. - Add SceneDelegate (UIWindowSceneDelegate) creating the window in scene(_:willConnectTo:); shared by the iOS and tvOS demo targets. - Add UIApplicationSceneManifest to both Info.plists (replaces UIMainStoryboardFile); the scene starts on SplashScreenViewController and AppDelegate swaps in the variation view once the SDK decides, as before. - AppDelegate keeps SDK init; window ownership moves to SceneDelegate, reached via UIApplication.shared.connectedScenes. Verified: installed on iPhone 17 (OS 27.0) simulator and launched — app stays alive on the splash screen (launch crash gone); DemoSwiftiOS Release build succeeds. Co-Authored-By: Claude Code --- DemoSwiftApp/AppDelegate.swift | 34 ++++++++++++++----- .../DemoSwiftApp.xcodeproj/project.pbxproj | 6 ++++ DemoSwiftApp/DemoSwiftiOS/Info.plist | 19 +++++++++-- DemoSwiftApp/DemoSwifttvOS/Info.plist | 19 +++++++++-- DemoSwiftApp/SceneDelegate.swift | 33 ++++++++++++++++++ 5 files changed, 98 insertions(+), 13 deletions(-) create mode 100644 DemoSwiftApp/SceneDelegate.swift diff --git a/DemoSwiftApp/AppDelegate.swift b/DemoSwiftApp/AppDelegate.swift index c82e7e2bb..4da536f09 100644 --- a/DemoSwiftApp/AppDelegate.swift +++ b/DemoSwiftApp/AppDelegate.swift @@ -32,7 +32,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { "bool_attr": false, "semanticVersioning": "1.2"] - var window: UIWindow? var optimizely: OptimizelyClient! var user: OptimizelyUserContext! @@ -168,17 +167,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate { _ = notificationCenter.addDatafileChangeNotificationListener(datafileListener: { _ in DispatchQueue.main.async { - #if os(iOS) - if let controller = self.window?.rootViewController { + if let controller = self.rootViewController() { + #if os(iOS) let alert = UIAlertController(title: "Datafile Changed", message: nil, preferredStyle: .alert) alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default)) controller.present(alert, animated: true) + #else + print("Datafile changed") + #endif } - #else - print("Datafile changed") - #endif - if let controller = self.window?.rootViewController as? VariationViewController { + if let controller = self.rootViewController() as? VariationViewController { let decision = self.user.decide(key: "show_coupon") controller.showCoupon = decision.enabled } @@ -223,12 +222,29 @@ class AppDelegate: UIResponder, UIApplicationDelegate { variationViewController.variationKey = variationKey variationViewController.eventKey = eventKey - window?.rootViewController = variationViewController + rootViewController(replaceWith: variationViewController) } } func openFailureView() { - window?.rootViewController = storyboard.instantiateViewController(withIdentifier: "FailureViewController") + rootViewController(replaceWith: storyboard.instantiateViewController(withIdentifier: "FailureViewController")) + } + + // The window is owned by SceneDelegate; these helpers keep the demo's + // root-view-controller swaps working under the UIScene life cycle. + + func rootViewController() -> UIViewController? { + (UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate)?.window?.rootViewController + } + + func rootViewController(replaceWith controller: UIViewController) { + (UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate)?.window?.rootViewController = controller + } + + // Called by SceneDelegate before the SDK has produced a decision so the + // scene connects with a non-empty window. + func initialViewController() -> UIViewController { + storyboard.instantiateViewController(withIdentifier: "SplashScreenViewController") } // MARK: - AppDelegate diff --git a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj index cd615c63b..48772dd46 100644 --- a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj +++ b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj @@ -8,6 +8,8 @@ /* Begin PBXBuildFile section */ 25C6F3B621C95D1700C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; }; + AA5C0DE19BF54A7D8C7E2F01 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */; }; + AA5C0DE39BF54A7D8C7E2F03 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */; }; 25C6F3B721C95D1800C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; }; 25C6F3BC21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; }; 25C6F3BD21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; }; @@ -253,6 +255,7 @@ EA299ED81E5530B800931399 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EA299EDE1E55312200931399 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/iOSMain.storyboard; sourceTree = ""; }; EA299EE21E55313B00931399 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; EA299EE51E55313B00931399 /* VariationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VariationViewController.swift; sourceTree = ""; }; EA5246CC1DC7186800AF6685 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -401,6 +404,7 @@ isa = PBXGroup; children = ( EA299EE21E55313B00931399 /* AppDelegate.swift */, + AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */, EA299EE51E55313B00931399 /* VariationViewController.swift */, 6E96811A21EE9552009B7FEC /* Customization */, 6EFA3229227CDDD3006FA572 /* Samples */, @@ -794,6 +798,7 @@ 25C6F3BC21C95D2100C2EBDD /* VariationViewController.swift in Sources */, 6EDBCE0022710E87009DF724 /* CustomLogger.swift in Sources */, 25C6F3B621C95D1700C2EBDD /* AppDelegate.swift in Sources */, + AA5C0DE19BF54A7D8C7E2F01 /* SceneDelegate.swift in Sources */, 6EFA31F5227BB60E006FA572 /* SamplesForAPI.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -806,6 +811,7 @@ 6EFA3212227CD571006FA572 /* SamplesForAPI.swift in Sources */, 6EDBCE0122710E87009DF724 /* CustomLogger.swift in Sources */, 25C6F3B721C95D1800C2EBDD /* AppDelegate.swift in Sources */, + AA5C0DE39BF54A7D8C7E2F03 /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/DemoSwiftApp/DemoSwiftiOS/Info.plist b/DemoSwiftApp/DemoSwiftiOS/Info.plist index 21912b974..61da67bb2 100644 --- a/DemoSwiftApp/DemoSwiftiOS/Info.plist +++ b/DemoSwiftApp/DemoSwiftiOS/Info.plist @@ -29,8 +29,23 @@ fetch - UIMainStoryboardFile - iOSMain + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneDelegateClassName + DemoSwiftiOS.SceneDelegate + + + + UIRequiredDeviceCapabilities armv7 diff --git a/DemoSwiftApp/DemoSwifttvOS/Info.plist b/DemoSwiftApp/DemoSwifttvOS/Info.plist index 817fa87f7..07f588f39 100644 --- a/DemoSwiftApp/DemoSwifttvOS/Info.plist +++ b/DemoSwiftApp/DemoSwifttvOS/Info.plist @@ -24,8 +24,23 @@ fetch - UIMainStoryboardFile - tvOSMain + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneDelegateClassName + DemoSwifttvOS.SceneDelegate + + + + UIRequiredDeviceCapabilities arm64 diff --git a/DemoSwiftApp/SceneDelegate.swift b/DemoSwiftApp/SceneDelegate.swift new file mode 100644 index 000000000..f6782a092 --- /dev/null +++ b/DemoSwiftApp/SceneDelegate.swift @@ -0,0 +1,33 @@ +// +// Copyright 2026, Optimizely, Inc. and contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import UIKit +import Optimizely + +// Shared by the iOS and tvOS demo targets. The window lives here because +// apps linked against the iOS/tvOS 27 SDK must use the UIScene life cycle. +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, + options connectionOptions: UIScene.ConnectionOptions) { + guard let windowScene = scene as? UIWindowScene else { return } + window = UIWindow(windowScene: windowScene) + window?.rootViewController = (UIApplication.shared.delegate as? AppDelegate)?.initialViewController() + window?.makeKeyAndVisible() + } +} From 0055692bc0fdd7e70129566860914669d90b9b6d Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Mon, 28 Sep 2026 18:41:56 +0600 Subject: [PATCH 10/18] ci: temporarily target PR branch in reusable workflow ref (FSSDK-11920) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit swift.yml calls unit_tests.yml@master, so PR runs execute master's old (pod-based) matrix and fail with "No Podfile found" — the branch's new workflow can never run on its own PR. Point the caller at this branch so CI exercises the new xcode-27 matrix. Revert to @master in the final merge commit once both files land together. Co-Authored-By: Claude Code --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index e76f723a9..f8fb77492 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -47,7 +47,7 @@ jobs: unittests: if: "${{ github.event.inputs.PREP == '' && github.event.inputs.RELEASE == '' }}" - uses: optimizely/swift-sdk/.github/workflows/unit_tests.yml@master + uses: optimizely/swift-sdk/.github/workflows/unit_tests.yml@copilot/remove-cocoapod-support prepare_for_release: runs-on: xcode-27 if: "${{ github.event.inputs.PREP == 'true' && github.event_name == 'workflow_dispatch' }}" From 88922044bfaa67c06feaa4068a1d657248906e7a Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Mon, 28 Sep 2026 18:48:13 +0600 Subject: [PATCH 11/18] ci: quote matrix os to keep 27.0 a string (FSSDK-11920) Unquoted 27.0 parses as a YAML float; Actions stringifies it to "27", so xcodebuild got OS=27 and found no matching device ("iPhone 17" exists on the runner only as OS 27.0). Old matrices used 17.2/18.2, whose float stringification keeps the fraction, so the bug never showed until a .0 release. Quote all four matrix values. Co-Authored-By: Claude Code --- .github/workflows/unit_tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 444097ab5..05f4f9d94 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -15,25 +15,25 @@ jobs: fail-fast: false matrix: include: - - os: 27.0 + - os: "27.0" device: "iPhone 17" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" os_type: "iOS" - - os: 27.0 + - os: "27.0" device: "iPad Pro 11-inch (M5)" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" os_type: "iOS" - - os: 27.0 + - os: "27.0" device: "iPhone 17 Pro" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" os_type: "iOS" - - os: 27.0 + - os: "27.0" device: "Apple TV 4K (3rd generation)" scheme: "OptimizelySwiftSDK-tvOS" test_sdk: "appletvsimulator" From 6645d588340734527dd47ecdbb201c15086e8b91 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Mon, 28 Sep 2026 19:07:26 +0600 Subject: [PATCH 12/18] ci: replace iPhone 17 Pro with iPhone Air in test matrix (FSSDK-11920) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The xcode-27 runner image ships no iPhone 17 Pro at OS 27.0, so xcodebuild cannot resolve the destination. Available iPhone simulators at 27.0 are iPhone 17, 17e, 18 Pro, 18 Pro Max, and Air — pick iPhone Air to keep three iOS device jobs. Co-Authored-By: Claude Code --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 05f4f9d94..1bada0626 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -28,7 +28,7 @@ jobs: platform: "iOS Simulator" os_type: "iOS" - os: "27.0" - device: "iPhone 17 Pro" + device: "iPhone Air" scheme: "OptimizelySwiftSDK-iOS" test_sdk: "iphonesimulator" platform: "iOS Simulator" From eaac0984471f44b820c3980a386c402dbbe26863 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Mon, 28 Sep 2026 19:33:20 +0600 Subject: [PATCH 13/18] ci: name unit-test step, drop unused coveralls-lcov gem (FSSDK-11920) The step had no explicit name, so Actions titled it after its first command ("Run gem install coveralls-lcov"), hiding what it does. Name it "Run unit tests". The gem itself was dead weight: the coverage path uses xccov2lcov in prepare_coveralls_report.sh, not coveralls-lcov. Co-Authored-By: Claude Code --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 1bada0626..4a73e0925 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -54,6 +54,7 @@ jobs: run: | echo "BRANCH=$REF_NAME" >> $GITHUB_ENV - id: unit_tests + name: Run unit tests env: SCHEME: ${{ matrix.scheme }} TEST_SDK: ${{ matrix.test_sdk }} @@ -62,7 +63,6 @@ jobs: OS_TYPE: ${{ matrix.os_type }} NAME: ${{ matrix.device }} run: | - gem install coveralls-lcov Scripts/run_unit_tests.sh - name: Check on failures (Archive Test Results) uses: actions/upload-artifact@v4 From 404bfcfe7afe051de43ad097dc72ec83d8f8eb83 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Mon, 28 Sep 2026 21:30:21 +0600 Subject: [PATCH 14/18] ci: auto-retry flaky unit-test jobs twice (FSSDK-11920) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The async-ordering tests (e.g. testDecideAsyncCompletionOrder) fail randomly on the iOS 27 matrix — a different one per run, and a crash on iPad sometimes kills the job before xcodebuild can name the test. Manual rerun --failed works but is whack-a-mole. Let the runner retry each failed job up to 2 extra times so flakes stop failing pipelines. Co-Authored-By: Claude Code --- .github/workflows/unit_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 4a73e0925..2e1a59cea 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -55,6 +55,8 @@ jobs: echo "BRANCH=$REF_NAME" >> $GITHUB_ENV - id: unit_tests name: Run unit tests + # ponytail: retry masks flaky async-ordering tests; remove when they're deracinated + retries: 2 env: SCHEME: ${{ matrix.scheme }} TEST_SDK: ${{ matrix.test_sdk }} From 811ca97e07befcc5e3e87341d7f5edf1015c935d Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Mon, 28 Sep 2026 21:58:14 +0600 Subject: [PATCH 15/18] build: raise watchOS minimum to 9.0 (FSSDK-11920) Co-Authored-By: Claude Opus 5.5 --- CLAUDE.md | 2 +- .../DemoSwiftApp.xcodeproj/project.pbxproj | 18 +++++++++--------- OptimizelySwiftSDK.xcodeproj/project.pbxproj | 18 ++++++++---------- Package.swift | 2 +- README.md | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 97a7527e7..959babd14 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -8,7 +8,7 @@ This is the Optimizely Swift SDK for Feature Experimentation and Full Stack. It ### Platform Support - iOS 15.0+ - tvOS 15.0+ -- watchOS 8.0+ +- watchOS 9.0+ - Swift 5+ ### Installation Methods diff --git a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj index 48772dd46..c9bff810f 100644 --- a/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj +++ b/DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj @@ -8,8 +8,6 @@ /* Begin PBXBuildFile section */ 25C6F3B621C95D1700C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; }; - AA5C0DE19BF54A7D8C7E2F01 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */; }; - AA5C0DE39BF54A7D8C7E2F03 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */; }; 25C6F3B721C95D1800C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; }; 25C6F3BC21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; }; 25C6F3BD21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; }; @@ -39,6 +37,8 @@ 75C71C6925E45A980084187E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75C71C6825E45A980084187E /* Assets.xcassets */; }; 75C71C8825E45B5C0084187E /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75C71C8125E45A980084187E /* Optimizely.framework */; }; 75C71C8925E45B5C0084187E /* Optimizely.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 75C71C8125E45A980084187E /* Optimizely.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + AA5C0DE19BF54A7D8C7E2F01 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */; }; + AA5C0DE39BF54A7D8C7E2F03 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -252,10 +252,10 @@ 75C71C6425E45A980084187E /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = ""; }; 75C71C6825E45A980084187E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 75C71C6A25E45A980084187E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; EA299ED81E5530B800931399 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EA299EDE1E55312200931399 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/iOSMain.storyboard; sourceTree = ""; }; EA299EE21E55313B00931399 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - AA5C0DE29BF54A7D8C7E2F02 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; EA299EE51E55313B00931399 /* VariationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VariationViewController.swift; sourceTree = ""; }; EA5246CC1DC7186800AF6685 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1009,7 +1009,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1036,7 +1036,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; @@ -1066,7 +1066,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1091,7 +1091,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; @@ -1161,7 +1161,7 @@ SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 15.0; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1221,7 +1221,7 @@ TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 15.0; VALIDATE_PRODUCT = YES; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; diff --git a/OptimizelySwiftSDK.xcodeproj/project.pbxproj b/OptimizelySwiftSDK.xcodeproj/project.pbxproj index 64db0eed2..d9dc46392 100644 --- a/OptimizelySwiftSDK.xcodeproj/project.pbxproj +++ b/OptimizelySwiftSDK.xcodeproj/project.pbxproj @@ -2113,16 +2113,12 @@ 98AC97F42DAE9685001405DD /* HoldoutConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC97F22DAE9685001405DD /* HoldoutConfigTests.swift */; }; 98AC98462DB7B762001405DD /* BucketTests_HoldoutToVariation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC98452DB7B762001405DD /* BucketTests_HoldoutToVariation.swift */; }; 98AC98472DB7B762001405DD /* BucketTests_HoldoutToVariation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC98452DB7B762001405DD /* BucketTests_HoldoutToVariation.swift */; }; - FF12813000000000FF000002 /* BatchEventBuilderTests_HoldoutIds.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF12813000000000FF000001 /* BatchEventBuilderTests_HoldoutIds.swift */; }; - FF12813000000000FF000003 /* BatchEventBuilderTests_HoldoutIds.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF12813000000000FF000001 /* BatchEventBuilderTests_HoldoutIds.swift */; }; 98AC98492DB8FC29001405DD /* DecisionServiceTests_Holdouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC98482DB8FC29001405DD /* DecisionServiceTests_Holdouts.swift */; }; 98AC984B2DB8FFE0001405DD /* DecisionServiceTests_Holdouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC98482DB8FC29001405DD /* DecisionServiceTests_Holdouts.swift */; }; 98AC985E2DBA6721001405DD /* OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC985D2DBA6721001405DD /* OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift */; }; 98AC985F2DBA6721001405DD /* OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AC985D2DBA6721001405DD /* OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift */; }; 98C2DF242F900669003F2443 /* DecisionServiceTests_LocalHoldouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98C2DF232F900669003F2443 /* DecisionServiceTests_LocalHoldouts.swift */; }; 98C2DF252F900669003F2443 /* DecisionServiceTests_LocalHoldouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98C2DF232F900669003F2443 /* DecisionServiceTests_LocalHoldouts.swift */; }; - E793710B634841BF89AA931E /* DecisionServiceTests_ExcludeTargetedDeliveries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EA2AD71FDC644278FE20412 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift */; }; - BC46ADF752734A65854A6676 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EA2AD71FDC644278FE20412 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift */; }; 98D5AE842DBB91C0000D5844 /* OptimizelyUserContextTests_Decide_Holdouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D5AE832DBB91C0000D5844 /* OptimizelyUserContextTests_Decide_Holdouts.swift */; }; 98D5AE852DBB91C0000D5844 /* OptimizelyUserContextTests_Decide_Holdouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D5AE832DBB91C0000D5844 /* OptimizelyUserContextTests_Decide_Holdouts.swift */; }; 98F28A1D2E01940500A86546 /* Cmab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F28A1C2E01940500A86546 /* Cmab.swift */; }; @@ -2179,6 +2175,7 @@ 98F28A652E0451CC00A86546 /* CmabService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F28A552E0451CC00A86546 /* CmabService.swift */; }; 98F28A672E05220300A86546 /* CmabServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F28A662E05220300A86546 /* CmabServiceTests.swift */; }; 98F28A682E05220300A86546 /* CmabServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F28A662E05220300A86546 /* CmabServiceTests.swift */; }; + BC46ADF752734A65854A6676 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EA2AD71FDC644278FE20412 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift */; }; BD1C3E8524E4399C0084B4DA /* SemanticVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B97DD93249D327F003DE606 /* SemanticVersion.swift */; }; BD64853C2491474500F30986 /* Optimizely.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E75167A22C520D400B2B157 /* Optimizely.h */; settings = {ATTRIBUTES = (Public, ); }; }; BD64853E2491474500F30986 /* Audience.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E75169822C520D400B2B157 /* Audience.swift */; }; @@ -2271,6 +2268,9 @@ C78CAFAE24486E0A009FE876 /* OptimizelyJSON+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C78CAFA324486E0A009FE876 /* OptimizelyJSON+ObjC.swift */; }; C78CAFAF24486E0A009FE876 /* OptimizelyJSON+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C78CAFA324486E0A009FE876 /* OptimizelyJSON+ObjC.swift */; }; C78CAFB024486E0A009FE876 /* OptimizelyJSON+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C78CAFA324486E0A009FE876 /* OptimizelyJSON+ObjC.swift */; }; + E793710B634841BF89AA931E /* DecisionServiceTests_ExcludeTargetedDeliveries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EA2AD71FDC644278FE20412 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift */; }; + FF12813000000000FF000002 /* BatchEventBuilderTests_HoldoutIds.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF12813000000000FF000001 /* BatchEventBuilderTests_HoldoutIds.swift */; }; + FF12813000000000FF000003 /* BatchEventBuilderTests_HoldoutIds.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF12813000000000FF000001 /* BatchEventBuilderTests_HoldoutIds.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -2557,6 +2557,7 @@ 6E981FC1232C363300FADDD6 /* DecisionListenerTests_Datafile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecisionListenerTests_Datafile.swift; sourceTree = ""; }; 6E994B3325A3E6EA00999262 /* DecisionResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecisionResponse.swift; sourceTree = ""; }; 6EA0FB1E251A5AEC00EC002D /* bucketer_test3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = bucketer_test3.json; sourceTree = ""; }; + 6EA2AD71FDC644278FE20412 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecisionServiceTests_ExcludeTargetedDeliveries.swift; sourceTree = ""; }; 6EA2CC232345618E001E7531 /* OptimizelyConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptimizelyConfig.swift; sourceTree = ""; }; 6EA425082218E41500B074B5 /* OptimizelyTests-Common-tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OptimizelyTests-Common-tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 6EA4255B2218E58400B074B5 /* OptimizelyTests-DataModel-tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OptimizelyTests-DataModel-tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2631,11 +2632,9 @@ 98AC97E12DAE4579001405DD /* HoldoutConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HoldoutConfig.swift; sourceTree = ""; }; 98AC97F22DAE9685001405DD /* HoldoutConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HoldoutConfigTests.swift; sourceTree = ""; }; 98AC98452DB7B762001405DD /* BucketTests_HoldoutToVariation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BucketTests_HoldoutToVariation.swift; sourceTree = ""; }; - FF12813000000000FF000001 /* BatchEventBuilderTests_HoldoutIds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatchEventBuilderTests_HoldoutIds.swift; sourceTree = ""; }; 98AC98482DB8FC29001405DD /* DecisionServiceTests_Holdouts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecisionServiceTests_Holdouts.swift; sourceTree = ""; }; 98AC985D2DBA6721001405DD /* OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptimizelyUserContextTests_Decide_With_Holdouts_Reasons.swift; sourceTree = ""; }; 98C2DF232F900669003F2443 /* DecisionServiceTests_LocalHoldouts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecisionServiceTests_LocalHoldouts.swift; sourceTree = ""; }; - 6EA2AD71FDC644278FE20412 /* DecisionServiceTests_ExcludeTargetedDeliveries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecisionServiceTests_ExcludeTargetedDeliveries.swift; sourceTree = ""; }; 98D5AE832DBB91C0000D5844 /* OptimizelyUserContextTests_Decide_Holdouts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptimizelyUserContextTests_Decide_Holdouts.swift; sourceTree = ""; }; 98F28A1C2E01940500A86546 /* Cmab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cmab.swift; sourceTree = ""; }; 98F28A2D2E01968000A86546 /* CmabTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CmabTests.swift; sourceTree = ""; }; @@ -2648,6 +2647,7 @@ C78CAF652446DB91009FE876 /* OptimizelyClientTests_OptimizelyJSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptimizelyClientTests_OptimizelyJSON.swift; sourceTree = ""; }; C78CAF8524485029009FE876 /* OptimizelyClientTests_OptimizelyJSON_Objc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OptimizelyClientTests_OptimizelyJSON_Objc.m; sourceTree = ""; }; C78CAFA324486E0A009FE876 /* OptimizelyJSON+ObjC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OptimizelyJSON+ObjC.swift"; sourceTree = ""; }; + FF12813000000000FF000001 /* BatchEventBuilderTests_HoldoutIds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatchEventBuilderTests_HoldoutIds.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -4307,8 +4307,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 6E14CD5F2423F80B00010234 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -7050,7 +7048,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -7078,7 +7076,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 8.0; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; diff --git a/Package.swift b/Package.swift index a70f2fa9e..fabe32fec 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .iOS(.v15), .tvOS(.v15), .macOS(.v12), - .watchOS(.v8) + .watchOS(.v9) ], products: [ .library(name: "Optimizely", diff --git a/README.md b/README.md index b14bb40f0..f29962954 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Optimizely Rollouts is [free feature flags](https://www.optimizely.com/free-feat Refer to the [Swift SDK's developer documentation](https://docs.developers.optimizely.com/experimentation/v4.0.0-full-stack/docs/swift-sdk) for detailed instructions on getting started with using the SDK. ### Requirements -* iOS 15.0+ / tvOS 15.0+ / watchOS 8.0+ / macOS 12.0+ +* iOS 15.0+ / tvOS 15.0+ / watchOS 9.0+ / macOS 12.0+ * Swift 5+ ### Install the SDK From a21ef4289a635a9e29aba98f4d44ad7e76c7ca31 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 28 Sep 2026 15:58:29 +0000 Subject: [PATCH 16/18] ci: fix PR review follow-ups Co-authored-by: muzahidul-opti <129880873+muzahidul-opti@users.noreply.github.com> --- .github/workflows/swift.yml | 2 +- .github/workflows/unit_tests.yml | 14 ++++++++++++-- Package.swift | 10 +++++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index f8fb77492..e14262d3f 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -47,7 +47,7 @@ jobs: unittests: if: "${{ github.event.inputs.PREP == '' && github.event.inputs.RELEASE == '' }}" - uses: optimizely/swift-sdk/.github/workflows/unit_tests.yml@copilot/remove-cocoapod-support + uses: ./.github/workflows/unit_tests.yml prepare_for_release: runs-on: xcode-27 if: "${{ github.event.inputs.PREP == 'true' && github.event_name == 'workflow_dispatch' }}" diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 2e1a59cea..9d88faf20 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -56,7 +56,6 @@ jobs: - id: unit_tests name: Run unit tests # ponytail: retry masks flaky async-ordering tests; remove when they're deracinated - retries: 2 env: SCHEME: ${{ matrix.scheme }} TEST_SDK: ${{ matrix.test_sdk }} @@ -65,7 +64,18 @@ jobs: OS_TYPE: ${{ matrix.os_type }} NAME: ${{ matrix.device }} run: | - Scripts/run_unit_tests.sh + for attempt in 1 2 3; do + if Scripts/run_unit_tests.sh; then + exit 0 + fi + + if [ "$attempt" -lt 3 ]; then + echo "Unit tests failed on attempt $attempt; retrying..." + rm -rf build "$COVERAGE_DIR" + fi + done + + exit 1 - name: Check on failures (Archive Test Results) uses: actions/upload-artifact@v4 if: steps.unit_tests.outcome != 'success' diff --git a/Package.swift b/Package.swift index fabe32fec..4b695398f 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:6.4 +// swift-tools-version:5.3 // The Swift tools version declares the version of the PackageDescription library, // the minimum version of the Swift tools and Swift language compatibility version to process the manifest, // and the minimum version of the Swift tools that are needed to use the Swift package. @@ -8,10 +8,10 @@ import PackageDescription let package = Package( name: "Optimizely", platforms: [ - .iOS(.v15), - .tvOS(.v15), - .macOS(.v12), - .watchOS(.v9) + .iOS("15.0"), + .tvOS("15.0"), + .macOS("12.0"), + .watchOS("9.0") ], products: [ .library(name: "Optimizely", From f8dbd115f2ac6036276b0e04de26698d111b27ed Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Tue, 29 Sep 2026 17:47:57 +0600 Subject: [PATCH 17/18] ci: drop dead scripts, harden coveralls step (FSSDK-11920) - Delete Scripts/runtimeVersion.sh and Scripts/change_header/replace_headers_folder.sh (no callers) - Pin xccov2lcov to a commit instead of fetching its moving HEAD - Pin coverallsapp/github-action to v2 instead of @master - continue-on-error on coverage steps so a coverage failure can't fail the test job Co-Authored-By: Claude Opus 5.5 --- .github/workflows/unit_tests.yml | 5 +++- .../change_header/replace_headers_folder.sh | 25 ------------------- Scripts/prepare_coveralls_report.sh | 2 +- Scripts/runtimeVersion.sh | 21 ---------------- 4 files changed, 5 insertions(+), 48 deletions(-) delete mode 100755 Scripts/change_header/replace_headers_folder.sh delete mode 100755 Scripts/runtimeVersion.sh diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 9d88faf20..8ea083638 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -86,6 +86,8 @@ jobs: - name: Check on success id: coveralls if: ${{ steps.unit_tests.outcome == 'success' && env.BRANCH == 'master' && env.PLATFORM == 'iOS Simulator' && env.NAME == 'iPhone 17' }} + # coverage is informational; a broken report must not fail the test job + continue-on-error: true env: PLATFORM: ${{ matrix.platform }} NAME: ${{ matrix.device }} @@ -94,7 +96,8 @@ jobs: sleep 5 - name: Upload coveralls report if: steps.coveralls.outcome == 'success' - uses: coverallsapp/github-action@master + continue-on-error: true + uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./xccov2lcov/lcov.info diff --git a/Scripts/change_header/replace_headers_folder.sh b/Scripts/change_header/replace_headers_folder.sh deleted file mode 100755 index 09eddba68..000000000 --- a/Scripts/change_header/replace_headers_folder.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -if [ $# != 1 ]; then - echo "Usage: replace_headers_folder.sh " - exit 1 -fi - -SCRIPT_DIR=`dirname $0` -ROOT_DIR="${PWD}/$1" - -# do no break spaces in file names -IFS=$'\n' - -pushd $SCRIPT_DIR > /dev/null - -for f in $(find $ROOT_DIR -name '*.swift' -or -name '*.h' -or -name '*.m') -do - if [[ "$f" == *"Pods/"* ]] ; then - continue - fi - - echo "replacing header for: $f" - replace_header.sh "$f" -done - -popd > /dev/null diff --git a/Scripts/prepare_coveralls_report.sh b/Scripts/prepare_coveralls_report.sh index adfb0eba0..defe3140c 100755 --- a/Scripts/prepare_coveralls_report.sh +++ b/Scripts/prepare_coveralls_report.sh @@ -8,7 +8,7 @@ # [coveralls] # - exclude coverage for Test codes by setting OptimizelySwiftSDK-iOS scheme > Test > Options > Gather coverage for selected targets -mkdir xccov2lcov && cd xccov2lcov && git init && git fetch --depth=1 https://github.com/trax-retail/xccov2lcov.git && git checkout FETCH_HEAD +mkdir xccov2lcov && cd xccov2lcov && git init && git fetch --depth=1 https://github.com/trax-retail/xccov2lcov.git fd0b15537f0b4b949d8e6b8a38eeef09a35d31ff && git checkout FETCH_HEAD xcrun xccov view --report --json ../$COVERAGE_DIR/Logs/Test/*.xcresult > coverage.json swift run xccov2lcov coverage.json > lcov.info cd .. diff --git a/Scripts/runtimeVersion.sh b/Scripts/runtimeVersion.sh deleted file mode 100755 index 290dd2664..000000000 --- a/Scripts/runtimeVersion.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -TEST_VAR=":blush:" -oldName="$1" -newName="$2" -swift_code() { -cat< Date: Tue, 29 Sep 2026 18:47:33 +0600 Subject: [PATCH 18/18] ci: gather coverage from test targets on Xcode 27 (FSSDK-11920) Test targets compile the SDK sources themselves. Xcode 27 no longer instruments targets outside the scheme's coverage list, so tests that don't go through Optimizely.framework recorded nothing and coverage fell from 93.9% to 56.2%. Gather coverage for all targets (xccov merges per source file) and export only Optimizely.framework to keep test code out of the report. Co-Authored-By: Claude Opus 5.5 --- .../xcshareddata/xcschemes/OptimizelySwiftSDK-iOS.xcscheme | 2 +- Scripts/prepare_coveralls_report.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDK-iOS.xcscheme b/OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDK-iOS.xcscheme index 27beb48fb..a05fd07e4 100644 --- a/OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDK-iOS.xcscheme +++ b/OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDK-iOS.xcscheme @@ -42,7 +42,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "YES"> + onlyGenerateCoverageForSpecifiedTargets = "NO"> Test > Options > Gather coverage for selected targets +# - test targets compile the SDK sources themselves, so the scheme gathers coverage for all targets +# (xccov merges per source file) and only Optimizely.framework is exported, excluding Test codes mkdir xccov2lcov && cd xccov2lcov && git init && git fetch --depth=1 https://github.com/trax-retail/xccov2lcov.git fd0b15537f0b4b949d8e6b8a38eeef09a35d31ff && git checkout FETCH_HEAD xcrun xccov view --report --json ../$COVERAGE_DIR/Logs/Test/*.xcresult > coverage.json -swift run xccov2lcov coverage.json > lcov.info +swift run xccov2lcov coverage.json --include-target Optimizely.framework > lcov.info cd ..