Add simulator to user agent string in case if it's present. (#116)

* Update dependencies. Start using xcframework versions of dependencies. Add simulator to user agent string in case if it's present. Fix build related warnings. Add update Carthage build step.
mapbox · Jun 23, 2022 · 11a941f · 11a941f
1 parent 083e3da
commit 11a941f
Show file tree

Hide file tree

Showing 13 changed files with 206 additions and 281 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,6 +19,13 @@ step-library:
         command: |
           echo "foo" > ~/.mapbox
 
+  - &update-carthage-version
+      run:
+        name: Update Carthage version
+        command: |
+          curl -OL "https://github.com/Carthage/Carthage/releases/download/0.38.0/Carthage.pkg"
+          sudo installer -pkg Carthage.pkg -target /
+
 jobs:
   SPM-job:
     parameters:
@@ -60,17 +67,18 @@ jobs:
       - checkout
       - *prepare
       - *restore-cache
+      - *update-carthage-version
       - run:
           name: Install prerequisites
           command: |
             if [ $(xcversion simulators | grep -cF "iOS << parameters.iOS >> Simulator (installed)") -eq 0 ]; then xcversion simulators --install="iOS << parameters.iOS >>" || true; fi
       - run:
           name: Dependencies
           command: |
-            ./scripts/wcarthage.sh bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries
-            ./scripts/wcarthage.sh bootstrap --platform tvos --cache-builds --configuration Debug --no-use-binaries
-            ./scripts/wcarthage.sh bootstrap --platform macos --cache-builds --configuration Debug --no-use-binaries
-            ./scripts/wcarthage.sh bootstrap --platform watchos --cache-builds --configuration Debug --no-use-binaries
+            carthage bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries --use-xcframeworks
+            carthage bootstrap --platform tvos --cache-builds --configuration Debug --no-use-binaries --use-xcframeworks
+            carthage bootstrap --platform macos --cache-builds --configuration Debug --no-use-binaries --use-xcframeworks
+            carthage bootstrap --platform watchos --cache-builds --configuration Debug --no-use-binaries --use-xcframeworks
       - *save-cache
       - run:
           name: iOS

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "AliSoftware/OHHTTPStubs" "9.0.0"
-github "raphaelmor/Polyline" "v5.0.2"
+github "AliSoftware/OHHTTPStubs" "9.1.0"
+github "raphaelmor/Polyline" "v5.0.3"
diff --git a/Example/ViewController.m b/Example/ViewController.m
@@ -39,7 +39,7 @@ - (void)viewDidAppear:(BOOL)animated {
     options.overlays = @[path];
     MBSnapshot *snapshot = [[MBSnapshot alloc] initWithOptions:options accessToken:AccessToken];
     __weak typeof(self) weakSelf = self;
-    [snapshot imageWithCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
+    (void)[snapshot imageWithCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
         typeof(weakSelf) strongSelf = weakSelf;
         strongSelf.imageView.image = image;
     }];

diff --git a/MapboxStatic.xcodeproj/project.pbxproj b/MapboxStatic.xcodeproj/project.pbxproj
diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DAF15A4A1CE90A6C0040E86C"
+            BuildableName = "MapboxStatic (Objective-C).app"
+            BlueprintName = "Example (Objective-C)"
+            ReferencedContainer = "container:MapboxStatic.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DAF15A4A1CE90A6C0040E86C"
-            BuildableName = "MapboxStatic (Objective-C).app"
-            BlueprintName = "Example (Objective-C)"
-            ReferencedContainer = "container:MapboxStatic.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:MapboxStatic.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Swift).xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Swift).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DDAD19581BD9B1780057AC9F"
+            BuildableName = "MapboxStatic (Swift).app"
+            BlueprintName = "Example (Swift)"
+            ReferencedContainer = "container:MapboxStatic.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DDAD19581BD9B1780057AC9F"
-            BuildableName = "MapboxStatic (Swift).app"
-            BlueprintName = "Example (Swift)"
-            ReferencedContainer = "container:MapboxStatic.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:MapboxStatic.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic Mac.xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DA20FBB81CE4757E00B07762"
+            BuildableName = "MapboxStatic.framework"
+            BlueprintName = "MapboxStaticMac"
+            ReferencedContainer = "container:MapboxStatic.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA20FBB81CE4757E00B07762"
-            BuildableName = "MapboxStatic.framework"
-            BlueprintName = "MapboxStaticMac"
-            ReferencedContainer = "container:MapboxStatic.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:MapboxStatic.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic iOS.xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DA20FB9A1CE3DEBB00B07762"
+            BuildableName = "MapboxStatic.framework"
+            BlueprintName = "MapboxStatic"
+            ReferencedContainer = "container:MapboxStatic.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA20FB9A1CE3DEBB00B07762"
-            BuildableName = "MapboxStatic.framework"
-            BlueprintName = "MapboxStatic"
-            ReferencedContainer = "container:MapboxStatic.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:MapboxStatic.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic tvOS.xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DA4B4B911CE8F83100296A52"
+            BuildableName = "MapboxStatic.framework"
+            BlueprintName = "MapboxStaticTV"
+            ReferencedContainer = "container:MapboxStatic.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA4B4B911CE8F83100296A52"
-            BuildableName = "MapboxStatic.framework"
-            BlueprintName = "MapboxStaticTV"
-            ReferencedContainer = "container:MapboxStatic.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:MapboxStatic.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic watchOS.xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/MapboxStatic watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,12 +26,10 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
             ReferencedContainer = "container:MapboxStatic.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Package.resolved b/Package.resolved
@@ -6,17 +6,17 @@
         "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs.git",
         "state": {
           "branch": null,
-          "revision": "e92b5a5746ef16add2a1424f1fc19529d9a75cde",
-          "version": "9.0.0"
+          "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9",
+          "version": "9.1.0"
         }
       },
       {
         "package": "Polyline",
         "repositoryURL": "https://github.com/raphaelmor/Polyline.git",
         "state": {
           "branch": null,
-          "revision": "36f7b1222aaf8fa741d0d179c12e186998d97f42",
-          "version": "5.0.2"
+          "revision": "554a15b15ff33cf6757f4cb693c5c285fe58694e",
+          "version": "5.0.3"
         }
       }
     ]

diff --git a/Sources/MapboxStatic/Snapshot.swift b/Sources/MapboxStatic/Snapshot.swift
@@ -62,7 +62,18 @@ let userAgent: String = {
     #else
         chip = "unknown"
     #endif
-    components.append("(\(chip))")
+
+    var simulator: String? = nil
+    #if targetEnvironment(simulator)
+        simulator = "Simulator"
+    #endif
+
+    let otherComponents = [
+        chip,
+        simulator
+    ].compactMap({ $0 })
+
+    components.append("(\(otherComponents.joined(separator: "; ")))")
 
     return components.joined(separator: " ")
 }()