From 598ac625196d7f8482ce2205ccbadc9774022b1a Mon Sep 17 00:00:00 2001 From: embrace-ci Date: Thu, 17 Oct 2024 15:19:44 +0000 Subject: [PATCH 01/11] CI/CD: Bumps version to '6.5.0-rc1' --- EmbraceIO.podspec | 4 +++- Sources/EmbraceCommonInternal/EmbraceMeta.swift | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EmbraceIO.podspec b/EmbraceIO.podspec index bad5d220..b4647a08 100644 --- a/EmbraceIO.podspec +++ b/EmbraceIO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "EmbraceIO" - spec.version = "6.4.2" + spec.version = "6.5.0-rc1" spec.summary = "Visibility into your users that you didn't have before." spec.description = <<-DESC Embrace is the only performance monitoring platform focused solely on mobile. We are built @@ -35,6 +35,7 @@ Pod::Spec.new do |spec| core.dependency "EmbraceIO/EmbraceUploadInternal" core.dependency "EmbraceIO/EmbraceObjCUtilsInternal" core.dependency "EmbraceIO/EmbraceSemantics" + core.dependency "EmbraceIO/EmbraceConfiguration" end spec.subspec 'EmbraceCommonInternal' do |common| @@ -56,6 +57,7 @@ Pod::Spec.new do |spec| spec.subspec 'EmbraceConfigInternal' do |config| config.vendored_frameworks = "xcframeworks/EmbraceConfigInternal.xcframework" config.dependency "EmbraceIO/EmbraceCommonInternal" + config.dependency "EmbraceIO/EmbraceConfiguration" end spec.subspec 'EmbraceOTelInternal' do |otel| diff --git a/Sources/EmbraceCommonInternal/EmbraceMeta.swift b/Sources/EmbraceCommonInternal/EmbraceMeta.swift index 2009b085..54b68763 100644 --- a/Sources/EmbraceCommonInternal/EmbraceMeta.swift +++ b/Sources/EmbraceCommonInternal/EmbraceMeta.swift @@ -6,5 +6,5 @@ // Do not edit this file manually public class EmbraceMeta { - public static let sdkVersion = "6.4.2" + public static let sdkVersion = "6.5.0-rc1" } From de5a863a72298d55132692b6ec9f53934a517fa6 Mon Sep 17 00:00:00 2001 From: Ariel Demarco Date: Thu, 17 Oct 2024 12:27:20 -0300 Subject: [PATCH 02/11] Fixed syntax error --- .github/workflows/create-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index b473f01d..f2bf7dc1 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -125,7 +125,6 @@ jobs: git commit -m "CI/CD: Bumps version to '$RC_VERSION'" git push - fi - name: Select Xcode 15 run: sudo xcode-select -switch /Applications/Xcode_15.4.app From 64c110895fc610a7298439568b7fec4a3e560ec0 Mon Sep 17 00:00:00 2001 From: Ariel Demarco Date: Thu, 17 Oct 2024 13:26:45 -0300 Subject: [PATCH 03/11] Added EmbraceConfiguration subspec to podspec template --- bin/templates/EmbraceIO.podspec.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/templates/EmbraceIO.podspec.tpl b/bin/templates/EmbraceIO.podspec.tpl index 6f9d4305..9ade575f 100644 --- a/bin/templates/EmbraceIO.podspec.tpl +++ b/bin/templates/EmbraceIO.podspec.tpl @@ -59,6 +59,10 @@ Pod::Spec.new do |spec| config.dependency "EmbraceIO/EmbraceCommonInternal" config.dependency "EmbraceIO/EmbraceConfiguration" end + + spec.subspec 'EmbraceConfiguration' do |config| + config.vendored_frameworks = "xcframeworks/EmbraceConfiguration.xcframework" + end spec.subspec 'EmbraceOTelInternal' do |otel| otel.vendored_frameworks = "xcframeworks/EmbraceOTelInternal.xcframework" From a04a1a7fc332666c85a91046c5b179a20d28c8d5 Mon Sep 17 00:00:00 2001 From: embrace-ci Date: Thu, 17 Oct 2024 16:27:30 +0000 Subject: [PATCH 04/11] CI/CD: Bumps version to '6.5.0-rc2' --- EmbraceIO.podspec | 6 +++++- Sources/EmbraceCommonInternal/EmbraceMeta.swift | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/EmbraceIO.podspec b/EmbraceIO.podspec index b4647a08..18e5ea16 100644 --- a/EmbraceIO.podspec +++ b/EmbraceIO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "EmbraceIO" - spec.version = "6.5.0-rc1" + spec.version = "6.5.0-rc2" spec.summary = "Visibility into your users that you didn't have before." spec.description = <<-DESC Embrace is the only performance monitoring platform focused solely on mobile. We are built @@ -59,6 +59,10 @@ Pod::Spec.new do |spec| config.dependency "EmbraceIO/EmbraceCommonInternal" config.dependency "EmbraceIO/EmbraceConfiguration" end + + spec.subspec 'EmbraceConfiguration' do |config| + config.vendored_frameworks = "xcframeworks/EmbraceConfiguration.xcframework" + end spec.subspec 'EmbraceOTelInternal' do |otel| otel.vendored_frameworks = "xcframeworks/EmbraceOTelInternal.xcframework" diff --git a/Sources/EmbraceCommonInternal/EmbraceMeta.swift b/Sources/EmbraceCommonInternal/EmbraceMeta.swift index 54b68763..e84d537c 100644 --- a/Sources/EmbraceCommonInternal/EmbraceMeta.swift +++ b/Sources/EmbraceCommonInternal/EmbraceMeta.swift @@ -6,5 +6,5 @@ // Do not edit this file manually public class EmbraceMeta { - public static let sdkVersion = "6.5.0-rc1" + public static let sdkVersion = "6.5.0-rc2" } From 4c4d7971b6e7a3fe5b808475a32648f8b3e04fec Mon Sep 17 00:00:00 2001 From: Ariel Demarco Date: Fri, 18 Oct 2024 15:10:34 -0300 Subject: [PATCH 05/11] Removed unnecessary code from create-release workflow --- .github/workflows/create-release.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index f2bf7dc1..d881f97c 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -17,10 +17,6 @@ on: description: "Is the release candidate production ready" type: boolean default: false - override_version: - description: "Should delete previous podspec (if exist) and create a new one" - type: boolean - default: false permissions: id-token: write @@ -46,6 +42,13 @@ jobs: fetch-depth: 0 fetch-tags: true + - name: Define Production Readiness + run: | + if [ -z "$IS_PRODUCTION_READY" ]; then + echo "IS_PRODUCTION_READY=false" >> $GITHUB_ENV + fi + echo "Production readiness determined: $IS_PRODUCTION_READY" + - name: Validate and Extract RC Version Number id: rc_version_extractor run: | @@ -297,13 +300,6 @@ jobs: echo "COCOAPODS_VERSION_EXISTS=false" >> $GITHUB_ENV fi - # Only can delete pre-productive releases in cocoapods - - name: Delete and recreate podspec - if: ${{ inputs.override_version }} && env.COCOAPODS_VERSION_EXISTS == 'true' && env.IS_PRODUCTION_READY == 'false' - run: | - echo "y" | pod trunk delete EmbraceIO $RC_VERSION || echo "Ignoring HTML Output" - echo "COCOAPODS_VERSION_EXISTS=false" >> $GITHUB_ENV - - name: Push EmbraceIO Podspec if: env.COCOAPODS_VERSION_EXISTS == 'false' run: | From 987ec4bc66111153b62b7f4f0c28cb333192f03a Mon Sep 17 00:00:00 2001 From: Ariel Demarco Date: Fri, 18 Oct 2024 15:11:28 -0300 Subject: [PATCH 06/11] Added Changelog --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee48dd1e..f8dafded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ - +## 6.5.0 +*Oct 18th, 2024* +* Features + * Removed `SwiftLint` from `Package.swift` as a dependency, which reduces the download size of our SDK and prevents dependency resolution conflicts. + * For those consuming the SDK without an `appId`, `Embrace.Options` now includes the possibility to provide custom configuration (implementing `EmbraceConfigurable`). +* Fixes + * Fixed a linking conflict issue affecting some users both with SPM and CocoaPods. + * Implemented a fix to expose user customization methods (`userName`, `userEmail`, `userIdentifier`, and `clearUserProperties`) to Objective-C. + * Fixed a bug that caused the `Span.Status` to be incorrect when exporting a session ended due to a crash. ## 6.4.2 *Oct 2nd, 2024* From 1ac05fe6b1a330fdef4821df6b7afa31df1aeb36 Mon Sep 17 00:00:00 2001 From: embrace-ci Date: Fri, 18 Oct 2024 18:21:33 +0000 Subject: [PATCH 07/11] CI/CD: Bumps version to '6.5.0-rc3' --- EmbraceIO.podspec | 2 +- Sources/EmbraceCommonInternal/EmbraceMeta.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EmbraceIO.podspec b/EmbraceIO.podspec index 18e5ea16..eb3095d7 100644 --- a/EmbraceIO.podspec +++ b/EmbraceIO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "EmbraceIO" - spec.version = "6.5.0-rc2" + spec.version = "6.5.0-rc3" spec.summary = "Visibility into your users that you didn't have before." spec.description = <<-DESC Embrace is the only performance monitoring platform focused solely on mobile. We are built diff --git a/Sources/EmbraceCommonInternal/EmbraceMeta.swift b/Sources/EmbraceCommonInternal/EmbraceMeta.swift index e84d537c..2603de8a 100644 --- a/Sources/EmbraceCommonInternal/EmbraceMeta.swift +++ b/Sources/EmbraceCommonInternal/EmbraceMeta.swift @@ -6,5 +6,5 @@ // Do not edit this file manually public class EmbraceMeta { - public static let sdkVersion = "6.5.0-rc2" + public static let sdkVersion = "6.5.0-rc3" } From 0beaf24768985e9fe7d8fdf2f3e1dafc605e0efa Mon Sep 17 00:00:00 2001 From: Ariel Demarco Date: Fri, 18 Oct 2024 16:12:53 -0300 Subject: [PATCH 08/11] Fixed an issue that would prevent pushing to cocoapods --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index d881f97c..1f1d3a98 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -294,7 +294,7 @@ jobs: - name: Check if cocoapods version exists run: | info=$(pod trunk info EmbraceIO) - if echo "$info" | grep -q "$version"; then + if echo "$info" | grep -q "$RC_VERSION"; then echo "COCOAPODS_VERSION_EXISTS=true" >> $GITHUB_ENV else echo "COCOAPODS_VERSION_EXISTS=false" >> $GITHUB_ENV From 311b5da0aaf2ba58738ebc86a3e2c16eee03a1a5 Mon Sep 17 00:00:00 2001 From: embrace-ci Date: Fri, 18 Oct 2024 19:29:53 +0000 Subject: [PATCH 09/11] CI/CD: Bumps version to '6.5.0-rc4' --- EmbraceIO.podspec | 2 +- Sources/EmbraceCommonInternal/EmbraceMeta.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EmbraceIO.podspec b/EmbraceIO.podspec index eb3095d7..a44bef19 100644 --- a/EmbraceIO.podspec +++ b/EmbraceIO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "EmbraceIO" - spec.version = "6.5.0-rc3" + spec.version = "6.5.0-rc4" spec.summary = "Visibility into your users that you didn't have before." spec.description = <<-DESC Embrace is the only performance monitoring platform focused solely on mobile. We are built diff --git a/Sources/EmbraceCommonInternal/EmbraceMeta.swift b/Sources/EmbraceCommonInternal/EmbraceMeta.swift index 2603de8a..500ce054 100644 --- a/Sources/EmbraceCommonInternal/EmbraceMeta.swift +++ b/Sources/EmbraceCommonInternal/EmbraceMeta.swift @@ -6,5 +6,5 @@ // Do not edit this file manually public class EmbraceMeta { - public static let sdkVersion = "6.5.0-rc3" + public static let sdkVersion = "6.5.0-rc4" } From 6565418491e75c6ff7d105d049dbc346728a0648 Mon Sep 17 00:00:00 2001 From: embrace-ci Date: Fri, 18 Oct 2024 21:58:03 +0000 Subject: [PATCH 10/11] CI/CD: Bumps version to '6.5.0' --- EmbraceIO.podspec | 2 +- Sources/EmbraceCommonInternal/EmbraceMeta.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EmbraceIO.podspec b/EmbraceIO.podspec index a44bef19..0c918455 100644 --- a/EmbraceIO.podspec +++ b/EmbraceIO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "EmbraceIO" - spec.version = "6.5.0-rc4" + spec.version = "6.5.0" spec.summary = "Visibility into your users that you didn't have before." spec.description = <<-DESC Embrace is the only performance monitoring platform focused solely on mobile. We are built diff --git a/Sources/EmbraceCommonInternal/EmbraceMeta.swift b/Sources/EmbraceCommonInternal/EmbraceMeta.swift index 500ce054..ee5e551e 100644 --- a/Sources/EmbraceCommonInternal/EmbraceMeta.swift +++ b/Sources/EmbraceCommonInternal/EmbraceMeta.swift @@ -6,5 +6,5 @@ // Do not edit this file manually public class EmbraceMeta { - public static let sdkVersion = "6.5.0-rc4" + public static let sdkVersion = "6.5.0" } From e4cd54c6244257dd0127e8648e89ef6a2af462d9 Mon Sep 17 00:00:00 2001 From: Ariel Demarco Date: Fri, 18 Oct 2024 19:59:46 -0300 Subject: [PATCH 11/11] Removed unnecessary check for cocoapods duplication --- .github/workflows/create-release.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 1f1d3a98..847de960 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -291,17 +291,7 @@ jobs: cd embrace-apple-sdk bin/version_bump $RC_VERSION --cocoapods - - name: Check if cocoapods version exists - run: | - info=$(pod trunk info EmbraceIO) - if echo "$info" | grep -q "$RC_VERSION"; then - echo "COCOAPODS_VERSION_EXISTS=true" >> $GITHUB_ENV - else - echo "COCOAPODS_VERSION_EXISTS=false" >> $GITHUB_ENV - fi - - name: Push EmbraceIO Podspec - if: env.COCOAPODS_VERSION_EXISTS == 'false' run: | pod trunk push embrace-apple-sdk/EmbraceIO.podspec --allow-warnings