Bugfix/StoreKitConfiguration BuildPhase (yonaskolb#1026)

jcolicchio · web-flow · commit 05ea968f7037 · 2021-02-24T08:33:54.000+11:00
* Copy storekit to bundle resources by default

* Fix tests

* Update changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Next Version
 
+#### Fixed
+- Fixed regression on **.storekit** configuration files' default build phase. [#1026](https://github.com/yonaskolb/XcodeGen/pull/1026) @jcolicchio
+
 ## 2.19.0
 
 #### Added
diff --git a/Sources/ProjectSpec/FileType.swift b/Sources/ProjectSpec/FileType.swift
@@ -71,6 +71,7 @@ extension FileType {
         // resources
         "bundle": FileType(buildPhase: .resources),
         "xcassets": FileType(buildPhase: .resources),
+        "storekit": FileType(buildPhase: .resources),
 
         // sources
         "swift": FileType(buildPhase: .sources),
@@ -110,6 +111,5 @@ extension FileType {
         "xcfilelist": FileType(buildPhase: BuildPhaseSpec.none),
         "apns": FileType(buildPhase: BuildPhaseSpec.none),
         "pch": FileType(buildPhase: BuildPhaseSpec.none),
-        "storekit": FileType(buildPhase: BuildPhaseSpec.none),
     ]
 }
diff --git a/Tests/Fixtures/TestProject/project.yml b/Tests/Fixtures/TestProject/project.yml
@@ -21,6 +21,7 @@ fileGroups:
   - FileGroup
   - SomeFile
   - Utilities
+  - App_iOS/Configuration.storekit
 projectReferences:
   AnotherProject:
     path: ./AnotherProject/AnotherProject.xcodeproj
@@ -76,6 +77,7 @@ targets:
           - "**/excluded-file"
           - "excluded-file"
           - "Model.xcmappingmodel"
+          - "Configuration.storekit"
       - path: App_iOS
         name: App
         includes:
diff --git a/Tests/XcodeGenKitTests/SourceGeneratorTests.swift b/Tests/XcodeGenKitTests/SourceGeneratorTests.swift
@@ -591,6 +591,7 @@ class SourceGeneratorTests: XCTestCase {
                     - file.mlmodel
                     - Info.plist
                     - Intent.intentdefinition
+                    - Configuration.storekit
                     - Settings.bundle:
                       - en.lproj:
                         - Root.strings
@@ -646,6 +647,7 @@ class SourceGeneratorTests: XCTestCase {
                 try pbxProj.expectFile(paths: ["C", "file.metal"], buildPhase: .sources)
                 try pbxProj.expectFile(paths: ["C", "file.mlmodel"], buildPhase: .sources)
                 try pbxProj.expectFile(paths: ["C", "Intent.intentdefinition"], buildPhase: .sources)
+                try pbxProj.expectFile(paths: ["C", "Configuration.storekit"], buildPhase: .resources)
                 try pbxProj.expectFile(paths: ["C", "Settings.bundle"], buildPhase: .resources)
                 try pbxProj.expectFileMissing(paths: ["C", "Settings.bundle", "en.lproj"])
                 try pbxProj.expectFileMissing(paths: ["C", "Settings.bundle", "en.lproj", "Root.strings"])

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ extension FileType {`
`71`	`71`	`// resources`
`72`	`72`	`"bundle": FileType(buildPhase: .resources),`
`73`	`73`	`"xcassets": FileType(buildPhase: .resources),`
	`74`	`+ "storekit": FileType(buildPhase: .resources),`
`74`	`75`
`75`	`76`	`// sources`
`76`	`77`	`"swift": FileType(buildPhase: .sources),`
`@@ -110,6 +111,5 @@ extension FileType {`
`110`	`111`	`"xcfilelist": FileType(buildPhase: BuildPhaseSpec.none),`
`111`	`112`	`"apns": FileType(buildPhase: BuildPhaseSpec.none),`
`112`	`113`	`"pch": FileType(buildPhase: BuildPhaseSpec.none),`
`113`		`- "storekit": FileType(buildPhase: BuildPhaseSpec.none),`
`114`	`114`	`]`
`115`	`115`	`}`