Resolve various typos throughout the SDK

Co-authored-by: ArielDemarco <ariel.demarco@embrace.io>
embrace-io · Oct 7, 2024 · d53c92c · d53c92c
1 parent 52375c4
commit d53c92c
Show file tree

Hide file tree

Showing 147 changed files with 2,118 additions and 1,343 deletions.
diff --git a/.github/workflows/build-example-apps.yml b/.github/workflows/build-example-apps.yml
@@ -9,14 +9,14 @@ jobs:
   build-brandgame-app:
     name: Build BrandGame App
     timeout-minutes: 20
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
-        xcode_version: ["15.1"]
+        xcode_version: ["15.4"]
     steps:
       - name: Select Xcode
-        # See https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+        # See https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
         run: |
           sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app
           xcodebuild -version
@@ -46,14 +46,14 @@ jobs:
   build-demoobjc-app:
     name: Build Objc Demo App
     timeout-minutes: 20
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
-        xcode_version: ["15.1"]
+        xcode_version: ["15.4"]
     steps:
       - name: Select Xcode
-        # See https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+        # See https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
         run: |
           sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app
           xcodebuild -version

diff --git a/.github/workflows/build-platforms.yml b/.github/workflows/build-platforms.yml
@@ -12,15 +12,15 @@ jobs:
   build:
     name: Build ${{ matrix.platform_args }} - Xcode ${{ matrix.xcode_version }}
     timeout-minutes: 30
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
-        platform_args: ["iOS macOS tvOS"] # using a single string will run platforms in parallel
-        xcode_version: ["15.1"]
+        platform_args: ["iOS tvOS"] # using a single string will run platforms in parallel
+        xcode_version: ["15.4"]
     steps:
     - name: Select Xcode
-      # See https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+      # See https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
       run: |
         sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app
         xcodebuild -version

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -103,7 +103,7 @@ jobs:
 
   build_release_candidate:
     name: Bump Version and Build Release
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 60
     needs:
       - extractor
@@ -157,7 +157,7 @@ jobs:
           fi
 
       - name: Select Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.4.app
 
       - name: Install Mise
         run: |
@@ -187,6 +187,12 @@ jobs:
         with:
           name: Embrace-Universal Build Artifacts
           path: xcframeworks.zip
+
+      - name: Tag the release candidate version
+        if: env.IS_PRODUCTION_READY == 'false'
+        run: |
+          git tag $RC_VERSION
+          git push origin $RC_VERSION
 
   archive_cocoapods_artifacts:
     name: Archive Cocoapods Artifacts
@@ -275,7 +281,7 @@ jobs:
           if gh release view --repo embrace-io/embrace-apple-sdk $RC_VERSION > /dev/null 2>&1; then
             if [ "$IS_PRODUCTION_READY" == "false" ]; then
               echo "Release $RC_VERSION already exists; editing..."
-              gh release upload $RC_VERSION cocoapods/embrace_$RC_VERSION.zip --clobber --repo embrace-io/embrace-apple-sdk
+              gh release upload $RC_VERSION cocoapods/embrace_$RC_VERSION.zip --clobber --repo embrace-io/embrace-apple-sdk --verify-tag
             else
               echo "Cannot update a production release"
               exit 1
@@ -286,12 +292,12 @@ jobs:
             if [ "$IS_PRODUCTION_READY" == "false" ]; then
               PRERELEASE_FLAG="--prerelease"
             fi
-            gh release create $RC_VERSION cocoapods/embrace_$RC_VERSION.zip --title "$RC_VERSION" $PRERELEASE_FLAG --repo embrace-io/embrace-apple-sdk
+            gh release create $RC_VERSION cocoapods/embrace_$RC_VERSION.zip --title "$RC_VERSION" $PRERELEASE_FLAG --repo embrace-io/embrace-apple-sdk  --verify-tag
           fi
 
   push_podspec:
     name: Push Podspec to Cocoapods
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 10
     needs:
       - extractor
@@ -304,6 +310,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:
+          ref: ${{ needs.extractor.outputs.rc_version }}
           fetch-depth: 0
           path: embrace-apple-sdk
 

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/EmbraceIO-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/EmbraceIO-Package.xcscheme
@@ -629,6 +629,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EmbraceConfigurationTests"
+               BuildableName = "EmbraceConfigurationTests"
+               BlueprintName = "EmbraceConfigurationTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/EmbraceIO.podspec b/EmbraceIO.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name                           = "EmbraceIO"
-  spec.version                        = "6.4.0"
+  spec.version                        = "6.4.2"
   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
@@ -43,6 +43,7 @@ Pod::Spec.new do |spec|
 
   spec.subspec 'EmbraceSemantics' do |semantics|
     semantics.vendored_frameworks = "xcframeworks/EmbraceSemantics.xcframework"
+    semantics.dependency "EmbraceIO/EmbraceCommonInternal"
   end
 
   spec.subspec 'EmbraceCaptureService' do |capture|
@@ -67,7 +68,6 @@ Pod::Spec.new do |spec|
     storage.vendored_frameworks = "xcframeworks/EmbraceStorageInternal.xcframework"
     storage.dependency "EmbraceIO/EmbraceCommonInternal"
     storage.dependency "EmbraceIO/EmbraceSemantics"
-    storage.dependency "EmbraceIO/OpenTelemetryApi"
     storage.dependency "EmbraceIO/GRDB"
   end
 

diff --git a/Examples/BombApp/BombApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/BombApp/BombApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f35065f67c35655933e2b4ed841314daab70232fc79185162a3eea7fe1831c3b",
+  "originHash" : "d471a26f48de52ea4ca90915729c04354c0c18d83f037e7ebf7731d1e72c2bc2",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -123,8 +123,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/embrace-io/KSCrash.git",
       "state" : {
-        "revision" : "30df8d35f1cc8d0537d595c4b18ddc0eb2675511",
-        "version" : "2.0.2"
+        "revision" : "17ad4c5159145ed550acb04b1cff48e826547265",
+        "version" : "2.0.4"
       }
     },
     {

diff --git a/Examples/BrandGame/BrandGame/Embrace/embrace.xcconfig b/Examples/BrandGame/BrandGame/Embrace/embrace.xcconfig
@@ -6,7 +6,7 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-// Do not include `http://` in config value as `//` is interpereted as a string
+// Do not include `http://` in config value as `//` is interpreted as a string
 // This applies even if it is in a string "http://example.com" will parse value as "http:"
 embraceBaseURL=;
 embraceDevelopmentBaseURL=;

diff --git a/...ctiveC/DemoObjectiveC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...ctiveC/DemoObjectiveC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "30bf3f1af4d312afac34bcff9ba35cc3f452c81988789fae8ce52c8747bfec81",
+  "originHash" : "3ee7ae69af0be2e15aa80d3d0b765480cdc4a3355f8c5b282cbc61e6c2c2899a",
   "pins" : [
     {
       "identity" : "collectionconcurrencykit",
@@ -33,17 +33,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/grpc/grpc-swift.git",
       "state" : {
-        "revision" : "6a90b7e77e29f9bda6c2b3a4165a40d6c02cfda1",
-        "version" : "1.23.0"
+        "revision" : "07123ed731671e800ab8d641006613612e954746",
+        "version" : "1.23.1"
       }
     },
     {
       "identity" : "kscrash",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/embrace-io/KSCrash.git",
       "state" : {
-        "revision" : "30df8d35f1cc8d0537d595c4b18ddc0eb2675511",
-        "version" : "2.0.2"
+        "revision" : "17ad4c5159145ed550acb04b1cff48e826547265",
+        "version" : "2.0.4"
       }
     },
     {
@@ -96,17 +96,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
-        "version" : "1.1.2"
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
       }
     },
     {
       "identity" : "swift-http-types",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-http-types",
       "state" : {
-        "revision" : "1ddbea1ee34354a6a2532c60f98501c35ae8edfa",
-        "version" : "1.2.0"
+        "revision" : "ae67c8178eb46944fd85e4dc6dd970e1f3ed6ccd",
+        "version" : "1.3.0"
       }
     },
     {
@@ -132,35 +132,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "fc79798d5a150d61361a27ce0c51169b889e23de",
-        "version" : "2.68.0"
+        "revision" : "1b33db2dea6a64d5b619b9e888175133c6d7f410",
+        "version" : "2.73.0"
       }
     },
     {
       "identity" : "swift-nio-extras",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-extras.git",
       "state" : {
-        "revision" : "05c36b57453d23ea63785d58a7dbc7b70ba1745e",
-        "version" : "1.23.0"
+        "revision" : "d1ead62745cc3269e482f1c51f27608057174379",
+        "version" : "1.24.0"
       }
     },
     {
       "identity" : "swift-nio-http2",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-http2.git",
       "state" : {
-        "revision" : "a0224f3d20438635dd59c9fcc593520d80d131d0",
-        "version" : "1.33.0"
+        "revision" : "b5f7062b60e4add1e8c343ba4eb8da2e324b3a94",
+        "version" : "1.34.0"
       }
     },
     {
       "identity" : "swift-nio-ssl",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-ssl.git",
       "state" : {
-        "revision" : "2b09805797f21c380f7dc9bedaab3157c5508efb",
-        "version" : "2.27.0"
+        "revision" : "7b84abbdcef69cc3be6573ac12440220789dcd69",
+        "version" : "2.27.2"
       }
     },
     {
@@ -177,8 +177,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "d57a5aecf24a25b32ec4a74be2f5d0a995a47c4b",
-        "version" : "1.27.0"
+        "revision" : "edb6ed4919f7756157fe02f2552b7e3850a538e5",
+        "version" : "1.28.1"
       }
     },
     {
@@ -195,8 +195,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-system.git",
       "state" : {
-        "revision" : "6a9e38e7bd22a3b8ba80bddf395623cf68f57807",
-        "version" : "1.3.1"
+        "revision" : "d2ba781702a1d8285419c15ee62fd734a9437ff5",
+        "version" : "1.3.2"
       }
     },
     {

diff --git a/Package.resolved b/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/embrace-io/KSCrash.git",
       "state" : {
-        "revision" : "30df8d35f1cc8d0537d595c4b18ddc0eb2675511",
-        "version" : "2.0.2"
+        "revision" : "17ad4c5159145ed550acb04b1cff48e826547265",
+        "version" : "2.0.4"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -20,15 +20,15 @@ let package = Package(
     ],
     products: [
         .library(name: "EmbraceIO", targets: ["EmbraceIO"]),
-        .library(name: "EmbraceCore", targets: ["EmbraceCore"]),
+        .library(name: "EmbraceCore", targets: ["EmbraceCore", "EmbraceConfiguration"]),
         .library(name: "EmbraceCrash", targets: ["EmbraceCrash"]),
         .library(name: "EmbraceCrashlyticsSupport", targets: ["EmbraceCrashlyticsSupport"]),
         .library(name: "EmbraceSemantics", targets: ["EmbraceSemantics"])
     ],
     dependencies: [
         .package(
              url: "https://github.com/embrace-io/KSCrash.git",
-             exact: "2.0.2"
+             exact: "2.0.4"
         ),
         .package(
             url: "https://github.com/open-telemetry/opentelemetry-swift",
@@ -40,7 +40,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/realm/SwiftLint",
-            exact: "0.53.0"
+            from: "0.53.0"
         ),
         .package(
             url: "https://github.com/apple/swift-docc-plugin",
@@ -80,6 +80,7 @@ let package = Package(
                 "EmbraceCaptureService",
                 "EmbraceCommonInternal",
                 "EmbraceConfigInternal",
+                "EmbraceConfiguration",
                 "EmbraceOTelInternal",
                 "EmbraceStorageInternal",
                 "EmbraceUploadInternal",
@@ -147,10 +148,25 @@ let package = Package(
         ),
 
         // config --------------------------------------------------------------------
+        .target(
+            name: "EmbraceConfiguration",
+            dependencies: [],
+            plugins: targetPlugins
+        ),
+
+        .testTarget(
+            name: "EmbraceConfigurationTests",
+            dependencies: [
+                "EmbraceConfiguration"
+            ],
+            plugins: targetPlugins
+        ),
+
         .target(
             name: "EmbraceConfigInternal",
             dependencies: [
-                "EmbraceCommonInternal"
+                "EmbraceCommonInternal",
+                "EmbraceConfiguration"
             ],
             plugins: targetPlugins
         ),
@@ -162,7 +178,7 @@ let package = Package(
                 "TestSupport"
             ],
             resources: [
-                .copy("Mocks/")
+                .copy("Fixtures")
             ],
             plugins: targetPlugins
         ),