CocoaPods update (#353)

* Bump CocoaPods * Fix runtime crash of CocoaPodsTest due to missing asset * Cherry-pick: Remove `TKUIMapManager.showOverlayPolygon` (#352) * Remove Datadog and SPM updates * Fix GHA * Maybe not checking this in helps?
skedgo · May 10, 2024 · 1a62a55 · 1a62a55
1 parent 626cd31
commit 1a62a55
Show file tree

Hide file tree

Showing 17 changed files with 146 additions and 451 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -8,21 +8,35 @@ on:
 
 jobs:
   build_spm:
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+    - uses: actions/checkout@v4
     - name: Build
       run: swift build --target TripKit
 
-  build_xcode:
+  build_spm_monterey:
     runs-on: macos-12
 
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: 14.2
+    - uses: actions/checkout@v4
+    - name: Build
+      run: swift build --target TripKit
+
+  build_xcode:
+    runs-on: macos-13
+
     steps:
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: latest-stable
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build TripKit Mac
       run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme "TripKit-macOS"
     - name: Build TripKitUI iOS
@@ -31,20 +45,16 @@ jobs:
       run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme "TripKitInterApp-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
 
   test_xcode:
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: latest-stable
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Run tests
       env:
         TRIPGO_API_KEY: ${{ secrets.TRIPGO_API_KEY }}
-        DATADOG_CLIENT_TOKEN: ${{ secrets.DATADOG_CLIENT_TOKEN }}
-        DD_TEST_RUNNER: 1
-        DD_ENV: ci
-        DD_SERVICE: tripkit-ios
       run: |
         xcodebuild test -quiet -project TripKit.xcodeproj -scheme "TripKit-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -resultBundlePath TestResults
     - uses: kishikawakatsumi/[email protected]
@@ -55,13 +65,13 @@ jobs:
       # even if the test fails in the previous step.
 
   examples:
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: latest-stable
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build TripKitUIExample
       run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme TripKitUIExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
     - name: Build MiniMap
@@ -73,4 +83,4 @@ jobs:
       run: |
         cd Examples/CocoaPodsTest
         pod install
-        xcodebuild build -workspace CocoaPodsTest.xcworkspace -scheme CocoaPodsTest -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
+        xcodebuild build -workspace CocoaPodsTest.xcworkspace -scheme CocoaPodsTest -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,8 @@ xcbaselines
 .swiftpm
 .build
 
+# Xcode left-overs
+TripKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
 
 # Examples
 /Examples/MiniMap/Pods

diff --git a/Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/xcshareddata/xcschemes/CocoaPodsTest.xcscheme b/Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/xcshareddata/xcschemes/CocoaPodsTest.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3A6BBD6D232A305100D87E99"
+               BuildableName = "CocoaPodsTest.app"
+               BlueprintName = "CocoaPodsTest"
+               ReferencedContainer = "container:CocoaPodsTest.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A6BBD6D232A305100D87E99"
+            BuildableName = "CocoaPodsTest.app"
+            BlueprintName = "CocoaPodsTest"
+            ReferencedContainer = "container:CocoaPodsTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A6BBD6D232A305100D87E99"
+            BuildableName = "CocoaPodsTest.app"
+            BlueprintName = "CocoaPodsTest"
+            ReferencedContainer = "container:CocoaPodsTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/Contents.json b/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "favorite-outline.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...ocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/favorite-outline.pdf b/...ocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/favorite-outline.pdf
diff --git a/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite.imageset/Contents.json b/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "favorite.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite.imageset/favorite.pdf b/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite.imageset/favorite.pdf
diff --git a/Examples/CocoaPodsTest/Podfile.lock b/Examples/CocoaPodsTest/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
   - GeoMonitor (0.1.2)
-  - Kingfisher (7.8.1)
-  - RxCocoa (6.5.0):
-    - RxRelay (= 6.5.0)
-    - RxSwift (= 6.5.0)
-  - RxRelay (6.5.0):
-    - RxSwift (= 6.5.0)
-  - RxSwift (6.5.0)
+  - Kingfisher (7.11.0)
+  - RxCocoa (6.7.1):
+    - RxRelay (= 6.7.1)
+    - RxSwift (= 6.7.1)
+  - RxRelay (6.7.1):
+    - RxSwift (= 6.7.1)
+  - RxSwift (6.7.1)
   - TGCardViewController (2.2.10)
   - TripKit (4.6.0)
   - TripKitInterApp (4.6.0):
@@ -43,15 +43,15 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GeoMonitor: 3af6b577d3f55007c3570c05ed20d0b97b18267e
-  Kingfisher: 63f677311d36a3473f6b978584f8a3845d023dc5
-  RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b
-  RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
-  RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
+  Kingfisher: b9c985d864d43515f404f1ef4a8ce7d802ace3ac
+  RxCocoa: f5609cb4637587a7faa99c5d5787e3ad582b75a4
+  RxRelay: 4151ba01152436b08271e08410135e099880eae5
+  RxSwift: b9a93a26031785159e11abd40d1a55bcb8057e52
   TGCardViewController: 5be5341ce00cb2275f9e6bd3c0b6aecb0735b845
   TripKit: 04fc9f32955703999c1dafffaf70e5031a2fdab3
   TripKitInterApp: 69721780f7e29880df93bc8f780a00abeb4ce742
   TripKitUI: b3d799cdd8d01de49de2b825f940f6fa84a937e7
 
 PODFILE CHECKSUM: fd67bcba748ae215ff8d7ed6cf43555a3235bd4a
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2