Added support for "driver-extension" and "system-extension" product types (#1094)

* Squashed commit of the following:

commit 0bcdce0d1f0f1d13fb5a284404e4eaea4e805a89
Author: Vlad Gorlov <volodymyr.gorlov@gmail.com>
Date:   Fri Jun 18 00:58:50 2021 +0200

    [#1092] Dependency version update.

commit 0040c46fd4ce9f42102faeb744104027b6c2c757
Author: Bruce Evans <bruce.evans.dev@gmail.com>
Date:   Wed Jun 16 09:12:01 2021 +0900

    Add Support for DocC in Xcode 13 (#1091)

    * Add support for DocC

    DocC "files" are actually folders `.docc` appended to the name, but Xcode 13 treats them differently. Therefore, we need to exclude them from the normal BuildPhase.

    Resolves #1089

    * Add tests for DocC

    Expanded an existing test to include .docc support.

    Also added a .docc catalog to the Test Project.

    * Update changelog.md

    * Update changelog.md to get the correct PR Link

commit 5bb7ef4e1c632f80f63c49ee280d64b8dab1603f
Author: Vlad Gorlov <volodymyr.gorlov@gmail.com>
Date:   Wed Jun 16 01:03:42 2021 +0200

    Added support for missed product types.

commit 3f8bfdf749d0d15da8490550b95a31cf961d8649
Author: Vlad Gorlov <volodymyr.gorlov@gmail.com>
Date:   Wed Jun 16 00:01:47 2021 +0200

    Added support for missed product types.

commit 235ebe4fe906716a6a37421346318fc6515836ce
Author: Vlad Gorlov <volodymyr.gorlov@gmail.com>
Date:   Tue Jun 15 23:53:52 2021 +0200

    Added support for missed product types.

* [#1094] Fixes failing tests.

* [#1094] Added test project targets.

* [#1094] Making iig-file type of source code.

* [#1094] Attempt to fix CI failure.

Author: vgorloff

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Added support for DocC Catalogs [#1091](https://github.com/yonaskolb/XcodeGen/pull/1091) @brevansio
+- Added support for "driver-extension" and "system-extension" product types [#1092](https://github.com/yonaskolb/XcodeGen/issues/1092) @vgorloff
 
 ## 2.23.1
 

Docs/ProjectSpec.md

@@ -292,6 +292,8 @@ This will provide default build settings for a certain product type. It can be a
 - `watchkit-extension`
 - `watchkit2-extension`
 - `xcode-extension`
+- `driver-extension`
+- `system-extension`
 - `xpc-service`
 - ``""`` (used for legacy targets)
 

Package.resolved

@@ -16,7 +16,7 @@ let package = Package(
         .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.2.0"),
         .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.2"),
         .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
-        .package(url: "https://github.com/tuist/XcodeProj.git", from: "7.23.0"),
+        .package(url: "https://github.com/tuist/XcodeProj.git", from: "8.0.0"),
         .package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.0"),
         .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
         .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .exact("0.2.0")),

Package.swift

@@ -87,6 +87,7 @@ extension FileType {
         "metal": FileType(buildPhase: .sources),
         "mlmodel": FileType(buildPhase: .sources),
         "rcproject": FileType(buildPhase: .sources),
+        "iig": FileType(buildPhase: .sources),
 
         // headers
         "h": FileType(buildPhase: .headers),

Sources/ProjectSpec/FileType.swift

@@ -33,7 +33,9 @@ extension Target {
              .watch2AppContainer,
              .watch2Extension,
              .xcodeExtension,
-             .xpcService:
+             .xpcService,
+             .systemExtension,
+             .driverExtension:
             return .none
         case .framework, .xcFramework:
             // Check the MACH_O_TYPE for "Static Framework"

Sources/ProjectSpec/Linkage.swift

@@ -26,6 +26,10 @@ extension PBXProductType {
         fileExtension == "appex"
     }
 
+    public var isSystemExtension: Bool {
+        fileExtension == "dext" || fileExtension == "systemextension"
+    }
+
     public var isApp: Bool {
         fileExtension == "app"
     }
@@ -35,7 +39,7 @@ extension PBXProductType {
     }
 
     public var isExecutable: Bool {
-        isApp || isExtension || isTest || self == .commandLineTool
+        isApp || isExtension || isSystemExtension || isTest || self == .commandLineTool
     }
 
     public var name: String {
@@ -89,7 +93,7 @@ extension Platform {
 extension Target {
     public var shouldExecuteOnLaunch: Bool {
         // This is different from `type.isExecutable`, because we don't want to "run" a test
-        type.isApp || type.isExtension || type == .commandLineTool
+        type.isApp || type.isExtension || type.isSystemExtension || type == .commandLineTool
     }
 }
 

Sources/ProjectSpec/XCProjExtensions.swift

@@ -669,6 +669,7 @@ public class PBXProjGenerator {
         var copyWatchReferences: [PBXBuildFile] = []
         var packageDependencies: [XCSwiftPackageProductDependency] = []
         var extensions: [PBXBuildFile] = []
+        var systemExtensions: [PBXBuildFile] = []
         var appClips: [PBXBuildFile] = []
         var carthageFrameworksToEmbed: [String] = []
         let localPackageReferences: [String] = project.packages.compactMap { $0.value.isLocal ? $0.key : nil }
@@ -729,6 +730,9 @@ public class PBXProjGenerator {
                 if dependencyTarget.type.isExtension {
                     // embed app extension
                     extensions.append(embedFile)
+                } else if dependencyTarget.type.isSystemExtension {
+                    // embed system extension
+                    systemExtensions.append(embedFile)
                 } else if dependencyTarget.type == .onDemandInstallCapableApplication {
                     // embed app clip
                     appClips.append(embedFile)
@@ -1001,9 +1005,9 @@ public class PBXProjGenerator {
             return sourceFilesByCopyFiles.mapValues { getBuildFilesForSourceFiles($0) }
         }
 
-        func getPBXCopyFilesBuildPhase(dstSubfolderSpec: PBXCopyFilesBuildPhase.SubFolder, name: String, files: [PBXBuildFile]) -> PBXCopyFilesBuildPhase {
+        func getPBXCopyFilesBuildPhase(dstSubfolderSpec: PBXCopyFilesBuildPhase.SubFolder, dstPath: String = "", name: String, files: [PBXBuildFile]) -> PBXCopyFilesBuildPhase {
             return PBXCopyFilesBuildPhase(
-                dstPath: "",
+                dstPath: dstPath,
                 dstSubfolderSpec: dstSubfolderSpec,
                 name: name,
                 buildActionMask: target.onlyCopyFilesOnInstall ? PBXProjGenerator.copyFilesActionMask : PBXBuildPhase.defaultBuildActionMask,
@@ -1116,6 +1120,16 @@ public class PBXProjGenerator {
             buildPhases.append(copyFilesPhase)
         }
 
+        if !systemExtensions.isEmpty {
+
+            let copyFilesPhase = addObject(
+                // With parameters below the Xcode will show "Destination: System Extensions".
+                getPBXCopyFilesBuildPhase(dstSubfolderSpec: .productsDirectory, dstPath: "$(SYSTEM_EXTENSIONS_FOLDER_PATH)", name: "Embed System Extensions", files: systemExtensions)
+            )
+
+            buildPhases.append(copyFilesPhase)
+        }
+
         if !appClips.isEmpty {
 
             let copyFilesPhase = addObject(

Sources/XcodeGenKit/PBXProjGenerator.swift

@@ -0,0 +1,22 @@
+//
+//  Driver.cpp
+//  Driver
+//
+//  Created by Vlad Gorlov on 18.06.21.
+//
+
+#include <os/log.h>
+
+#include <DriverKit/IOUserServer.h>
+#include <DriverKit/IOLib.h>
+
+#include "Driver.h"
+
+kern_return_t
+IMPL(Driver, Start)
+{
+    kern_return_t ret;
+    ret = Start(provider, SUPERDISPATCH);
+    os_log(OS_LOG_DEFAULT, "Hello World");
+    return ret;
+}

Tests/Fixtures/TestProject/DriverKit Driver/Driver.cpp

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+</dict>
+</plist>