Merge branch 'master' into muzahid-test-fsc-2

Author: muzahidul-opti

.github/workflows/integration_tests.yml

@@ -5,9 +5,6 @@ on:
     secrets:
       CI_USER_TOKEN:
         required: true
-      TRAVIS_COM_TOKEN:
-        required: true
-
 jobs:
   integration_tests:
     runs-on: ubuntu-latest
@@ -16,8 +13,8 @@ jobs:
       with:
         # You should create a personal access token and store it in your repository
         token: ${{ secrets.CI_USER_TOKEN }}
-        repository: 'optimizely/travisci-tools'
-        path: 'home/runner/travisci-tools'
+        repository: 'optimizely/ci-helper-tools'
+        path: 'home/runner/ci-helper-tools'
         ref: 'master'
     - name: set SDK Branch if PR
       env: 
@@ -31,7 +28,6 @@ jobs:
       if: ${{ github.event_name != 'pull_request' }}
       run: |
         echo "SDK_BRANCH=$REF_NAME" >> $GITHUB_ENV
-        echo "TRAVIS_BRANCH=$REF_NAME" >> $GITHUB_ENV
     - name: Trigger build
       env:
         SDK: swift
@@ -41,14 +37,12 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
         EVENT_TYPE: ${{ github.event_name }}
         GITHUB_CONTEXT: ${{ toJson(github) }}
-        #REPO_SLUG: ${{ github.repository }}
         PULL_REQUEST_SLUG: ${{ github.repository }}
         UPSTREAM_REPO: ${{ github.repository }}
         PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
         PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
         UPSTREAM_SHA: ${{ github.sha }}
-        TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
         EVENT_MESSAGE: ${{ github.event.message }}
         HOME: 'home/runner'
       run: |
-        home/runner/travisci-tools/trigger-script-with-status-update.sh
+        home/runner/ci-helper-tools/trigger-script-with-status-update.sh

.github/workflows/source_clear_cron.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   source_clear:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
       - name: Source clear scan

.github/workflows/swift.yml

@@ -17,7 +17,7 @@ on:
         description: release
 
 env:
-  VERSION: 5.0.0
+  VERSION: 5.1.0
 
 jobs:
 
@@ -29,10 +29,9 @@ jobs:
     uses: optimizely/swift-sdk/.github/workflows/integration_tests.yml@master
     secrets:
       CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
-      TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
 
   lint: 
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: maxim-lobanov/setup-xcode@v1
@@ -41,16 +40,15 @@ jobs:
     - env:
         SRCCLR_API_TOKEN: ${{ secrets.SRCCLR_API_TOKEN }}
       run: |
-        gem install cocoapods -v '1.9.3'
+        gem install cocoapods -v '1.15.2'
         pod spec lint --quick
         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-12
+    runs-on: macos-13
     if: "${{ github.event.inputs.PREP == 'true' && github.event_name == 'workflow_dispatch' }}" 
     steps:
     - uses: actions/checkout@v3
@@ -69,7 +67,7 @@ jobs:
         BRANCH: ${{ github.ref_name }}
         GITHUB_USER: optibot
         GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
-        COCOAPODS_VERSION: '1.12.1'
+        COCOAPODS_VERSION: '1.15.2'
       run: |
         gem install cocoapods -v $COCOAPODS_VERSION
         Scripts/run_prep.sh
@@ -79,7 +77,7 @@ jobs:
 
   release:
     if: "${{github.event.inputs.RELEASE == 'true' && github.event_name == 'workflow_dispatch' }}"
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: maxim-lobanov/setup-xcode@v1
@@ -96,7 +94,7 @@ jobs:
         BRANCH: ${{ github.ref_name }}
         GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-        COCOAPODS_VERSION: '1.12.1'
+        COCOAPODS_VERSION: '1.15.2'
       run: |
         gem install cocoapods -v $COCOAPODS_VERSION
         Scripts/run_release.sh

.github/workflows/unit_tests.yml

@@ -7,7 +7,7 @@ env:
 
 jobs:
   unittests:
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       fail-fast: false
       matrix:
@@ -19,27 +19,27 @@ jobs:
         # - see "https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md" for installed macOS, xcode and simulator versions.
         include:
           - os: 16.1
-            device: "iPhone 12"
+            device: "iPhone 14"
             scheme: "OptimizelySwiftSDK-iOS"
             test_sdk: "iphonesimulator"
             platform: "iOS Simulator"
             os_type: "iOS"
             simulator_xcode_version: 14.1
-          - os: 15.5
-            device: "iPhone 12"
+          - os: 16.2
+            device: "iPhone 14"
             scheme: "OptimizelySwiftSDK-iOS"
             test_sdk: "iphonesimulator"
             platform: "iOS Simulator"
             os_type: "iOS"
-            simulator_xcode_version: 13.4.1
-          - os: 15.5
+            simulator_xcode_version: 14.2
+          - os: 16.4
             # good to have tests with older OS versions, but it looks like this is min OS+xcode versions supported by github actions
-            device: "iPad Air (4th generation)"
+            device: "iPad Air (5th generation)"
             scheme: "OptimizelySwiftSDK-iOS"
             test_sdk: "iphonesimulator"
             platform: "iOS Simulator"
             os_type: "iOS"
-            simulator_xcode_version: 13.4.1
+            simulator_xcode_version: 14.3.1
           - os: 16.1
             device: "Apple TV"
             scheme: "OptimizelySwiftSDK-tvOS"
@@ -76,7 +76,7 @@ jobs:
           NAME: ${{ matrix.device }}
         run: |
           gem install coveralls-lcov
-          gem install cocoapods -v '1.11.3'
+          gem install cocoapods -v '1.15.2'
           pod repo update
           pod install
           HOMEBREW_NO_INSTALL_CLEANUP=true brew update && brew install jq
@@ -85,7 +85,7 @@ jobs:
           # - 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
+          # xcrun simctl list --json devices
 
           # switch to the target xcode version
           sudo xcode-select -switch /Applications/Xcode_$SIMULATOR_XCODE_VERSION.app

CHANGELOG.md

@@ -1,10 +1,16 @@
 # Optimizely Swift SDK Changelog
 
+## 5.1.0
+February 4th, 2025
+
+### Functionality Enhancement
+* Add support for nested event tags ([#570](https://github.com/optimizely/swift-sdk/pull/570)).
+
 ## 5.0.0
 November 25th, 2024
 
 ### Breaking Changes
-* VUID configuration is now independent of ODP ([#556](https://github.com/optimizely/swift-sdk/pull/556))
+* VUID configuration is now independent of ODP ([#456](https://github.com/optimizely/swift-sdk/pull/556))
 * When VUID is disabled:
     * `vuid` is not generated or saved.
     * `client-initialized` event will not auto fired on SDK init.

OptimizelySwiftSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "OptimizelySwiftSDK"
   s.module_name	            = "Optimizely"
-  s.version                 = "4.1.0"
+  s.version                 = "5.1.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" }