XcodeGen refactor (#1989)

* Refactor xcodegen * Collect coverage for all targets * Improve double-tap gesture test * Add _settings suffix to setting groups
mapbox · Jan 22, 2024 · f3a6bc0 · f3a6bc0
1 parent de9f4ca
commit f3a6bc0
Show file tree

Hide file tree

Showing 10 changed files with 251 additions and 374 deletions.
diff --git a/Apps/Examples/Examples.xcodeproj/project.pbxproj b/Apps/Examples/Examples.xcodeproj/project.pbxproj
diff --git a/Apps/Examples/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme b/Apps/Examples/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme
@@ -4,8 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -27,17 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "NO"
-      onlyGenerateCoverageForSpecifiedTargets = "NO">
-      <TestPlans>
-         <TestPlanReference
-            default = "YES"
-            reference = "container:../../Tests/TestPlans/Examples.xctestplan">
-         </TestPlanReference>
-         <TestPlanReference
-            reference = "container:../../Tests/TestPlans/Examples no unit tests.xctestplan">
-         </TestPlanReference>
-      </TestPlans>
+      shouldUseLaunchSchemeArgsEnv = "NO">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -47,6 +36,37 @@
             ReferencedContainer = "container:Examples.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "MTL_HUD_ENABLED"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "MTL_HUD_ALIGNMENT"
+            value = "20"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "MAPBOX_MAPS_SIGNPOSTS_ENABLED"
+            value = "1"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "MAPBOX_REOPEN_EXAMPLE"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:../../Tests/TestPlans/Examples.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+         <TestPlanReference
+            reference = "container:../../Tests/TestPlans/Examples no unit tests.xctestplan">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -69,25 +89,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "MTL_HUD_ENABLED"
-            value = "1"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "MAPBOX_MAPS_SIGNPOSTS_ENABLED"
-            value = "1"
-            isEnabled = "NO">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "MAPBOX_REOPEN_EXAMPLE"
-            value = "1"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -109,14 +110,17 @@
             ReferencedContainer = "container:Examples.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "MTL_HUD_ENABLED"
             value = "1"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "MTL_HUD_ALIGNMENT"
+            value = "20"
+            isEnabled = "YES">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "MAPBOX_MAPS_SIGNPOSTS_ENABLED"
             value = "1"
@@ -145,14 +149,17 @@
             ReferencedContainer = "container:Examples.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "MTL_HUD_ENABLED"
             value = "1"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "MTL_HUD_ALIGNMENT"
+            value = "20"
+            isEnabled = "YES">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "MAPBOX_MAPS_SIGNPOSTS_ENABLED"
             value = "1"

diff --git a/Apps/Examples/project.yml b/Apps/Examples/project.yml
@@ -2,26 +2,24 @@ name: Examples
 include:
   - ../../xcodegen/Examples.yml
 packages:
-  Fingertips:
-    url: [email protected]:mapbox/Fingertips.git
-    from: 0.6.0
   MapboxMaps:
-    path: ../../.
+    path: ../../
 targets:
   Examples:
-    templates:
-      - swiftlintScript
-      - generateTokenFileScript
     settings:
       base:
-        SWIFT_OBJC_BRIDGING_HEADER: Examples/Examples-Bridging-Header.h
-        MAPBOXMAPS_PATH: ../../.
-    dependencies:REPLACE:
-      - package: MapboxMaps
-      - package: Fingertips
+        MAPBOXMAPS_PATH: ../../
     scheme:
       testPlans:
         - path: ../../Tests/TestPlans/Examples.xctestplan
           defaultPlan: true
         - path: ../../Tests/TestPlans/Examples no unit tests.xctestplan
-          defaultPlan: true
+          defaultPlan: true
+
+targetTemplates:
+  map-library:REPLACE:
+    dependencies:
+      - package: MapboxMaps
+
+  maps-dependencies:
+    dependencies:
diff --git a/Tests/GestureTests/Double Taps and Touch/DoubleTapGesture.test.swift b/Tests/GestureTests/Double Taps and Touch/DoubleTapGesture.test.swift
@@ -8,6 +8,7 @@ final class DoubleTapGestureTestCase: GestureTestCase {
     func testDefaultQuickZoomInTwoTaps() async throws {
         try eventGenerator.fingerTap(numberOfTimes: 2)
 
+        XCTAssertFalse(mapView.camera.cameraAnimators.isEmpty)
         await mapView.camera.cameraAnimators.waitForAllAnimations()
 
         XCTAssertTrue(mapView.camera.cameraAnimators.isEmpty)

diff --git a/project.yml b/project.yml
@@ -31,17 +31,9 @@ packages:
 
 targets:
   Examples:
-    templates:
-      - swiftlintScript
-      - maps-dependencies
     settings:
-      base:
-        SWIFT_OBJC_BRIDGING_HEADER: Apps/Examples/Examples/Examples-Bridging-Header.h
       groups:
         - turf_library_evolution_settings
-    dependencies:
-      - target: MapboxMaps
-      - package: Fingertips
     scheme:
       testTargets:
         - MapboxMapsTests
@@ -53,4 +45,4 @@ targets:
     settings:
       base:
         RUN_DOCUMENTATION_COMPILER: YES
-        OTHER_DOCC_FLAGS: "--warnings-as-errors"
+        OTHER_DOCC_FLAGS: "--warnings-as-errors"
diff --git a/xcodegen/Examples.yml b/xcodegen/Examples.yml
@@ -1,25 +1,28 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Kila2/XcodeGen/master/Assets/json-schema/project.json
+
 include:
   - targets.yml
+packages:
+  Fingertips:
+    url: [email protected]:mapbox/Fingertips.git
+    from: 0.6.0
 targets:
   Examples:
     templates:
       - application
-      - installTokenScript
     settings:
       base:
         PRODUCT_BUNDLE_IDENTIFIER: com.mapbox.examples
+        SWIFT_OBJC_BRIDGING_HEADER: $(MAPBOXMAPS_PATH)/Apps/Examples/Examples/Examples-Bridging-Header.h
     sources:
       - path: ../Apps/Examples/Examples/
+    dependencies:
+      - package: Fingertips
     scheme:
       testTargets:
         - ExamplesTests
         - ExamplesUITests
       environmentVariables:
-        - variable: MTL_HUD_ENABLED
-          value: 1
-        - variable: MAPBOX_MAPS_SIGNPOSTS_ENABLED
-          value: 1
-          isEnabled: false
         - variable: MAPBOX_REOPEN_EXAMPLE
           value: 1
 

diff --git a/xcodegen/MapboxMaps.yml b/xcodegen/MapboxMaps.yml
@@ -1,3 +1,5 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Kila2/XcodeGen/master/Assets/json-schema/project.json
+
 include:
   - targets.yml
 targets:
@@ -8,7 +10,6 @@ targets:
       - maps-dependencies
     settings:
       groups:
-        - base_settings
         - turf_library_evolution_settings
       base:
         INSTALL_PATH: $(LOCAL_LIBRARY_DIR)/Frameworks

diff --git a/xcodegen/MapboxMapsTests.yml b/xcodegen/MapboxMapsTests.yml
@@ -1,3 +1,5 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Kila2/XcodeGen/master/Assets/json-schema/project.json
+
 include:
   - targets.yml
 targets:
@@ -15,8 +17,8 @@ targets:
   MapboxTestHost:
     templates:
       - application
-      - installTokenScript
       - maps-dependencies
+      - map-library
     settings:
       base:
         PRODUCT_BUNDLE_IDENTIFIER: "com.mapbox.MapboxMapsTestHost"
@@ -30,7 +32,6 @@ targets:
       - path: ../Sources/MapboxTestHost
     dependencies:
       - package: Fingertips
-      - target: MapboxMaps
     scheme:
       testTargets:
           - MapboxMapsTests

diff --git a/xcodegen/settings.yml b/xcodegen/settings.yml