Commit Graph

144 Commits

Author SHA1 Message Date
Elliott Williams 35212a6154 Rename Core to avoid collisions with other packages (i.e. GraphViz) (#1057)
* Rename 'Core' to 'XcodeGenCore'

* Update CHANGELOG.md

* Update CHANGELOG.md
2021-05-01 13:39:34 +10:00
Liam Nichols 1b57ba5c75 Improve INFOPLIST_FILE handling to only omit used Info.plist's from Copy Bundle Resources Build Phase (#1027)
* Update TestProject Fixture to include GoogleService-Info.plist resource bsaed on 2.18.0 generator

* Update TestProject fixture to include an Info.plist file named 'App-Info.plist' to simulate scenario in #945

* Resolve INFOPLIST_FILE values upfront ahead of resolving all source files for a target

* fixup! Resolve INFOPLIST_FILE values upfront ahead of resolving all source files for a target

* fixup! Resolve INFOPLIST_FILE values upfront ahead of resolving all source files for a target

* Refactor SourceGenerator to remove some redundant arguments on internal methods when generating source files in a target

* Update SourceGenerator to accept '[Path: BuildPhaseSpec]' of preferred build phases in order to prioritise over 'default' value. Remove explicit Info.plist check from SourceGenerator. Update PBXProjGenerator to inject hash of build phases for resolved INFOPLIST_FILE values. Update SourceGeneratorTests to comply with change where only the FIRST Info.plist is excluded from copy bundle resources build phase, additionally resolve absolute path

* Ensure project.basePath is always absolute when resolving Info.plist path relative to project

* Add test coverage in SourceGeneratorTests.swift

* Update CHANGELOG.md

* Reword CHANGELOG.md
2021-04-08 15:38:21 +10:00
Vasiliy Anisimov 282761cb21 Fixed adding Info.plists with custom names to Copy Bundle Resources build phase (#945)
* Fixed adding Info.plists with custom names to Copy Bundle Resources build phase

- Extended check for Info.plist, because they usually named not just "Info.plist", but "<TargetName>-Info.plist"

* Update CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: Yonas Kolb <yonaskolb@users.noreply.github.com>
2021-01-11 13:33:44 +11:00
Samuel Giddins c8b24acbdd Allow creating intermediary groups outside of the project directory (#892) 2020-09-02 14:45:27 -07:00
Yonas Kolb 20a99e5018 Add FileTypes for cross project file options (#914)
* move BuildPhase

* add fileTypes

* update changelog
2020-08-04 09:14:32 +10:00
Yonas Kolb 7da953a488 swift format 2020-06-17 18:12:34 +10:00
Joseph Colicchio 1f95a41b85 Compile xcmappingmodel files instead of copying them (#834)
* Compile xcmappingmodel files instead of copying them

* Add test for xcmappingmodel

* Update changelog

* Fix xcmappingmodel reference to avoid folder containing xml

* Fix xcmappingmodel contents to avoid test failure

* Tweak yaml to fix compiler flag on xcmappingmodel

avoid `-Werror` added to xcmappingmodel compiler flags, which was preventing compilation
2020-06-04 15:22:33 +10:00
Khaos Tian 474d8f6907 Bugfix: Ensure folder and wrapper directories are correctly set on generated project (#862)
Check for UTI type instead of hardcoded extensions.
2020-05-18 12:21:34 -05:00
Sam Kirchmeier aeb65969d4 Automatically include bundles in the Copy Bundle Resources build phase (#838) 2020-04-22 07:59:43 -05:00
Asif 400c19ee9a Bugfix: Consider folders with dot in it when generating projects (#826)
* Bug fix in SourceGenerator

Folders which would have a dot in it, would be added to Copy Bundle Resources even though it contained swift files. This commit, updates the if checks to check if the extension is not of type lproj or xcassets or bundle. This would let Xcodegen handle paths with dots in it

* Refactor SourceGenerator.swift getGroupSources function

* Add FolderWithDot2.0 to TestProject/App_iOS

* Update TestProject fixture with SwiftFileInDotPath and FolderWithDot2.0 changes

* Update test to assert bundles are included in resources

* Remove intentDefinition from whitelistedDirectoryExtensions because it's not a directory, it's always a file so the check is not required
2020-04-09 07:47:54 -05:00
freddi(Yuki Aki) a077f2da88 Update Sources/XcodeGenKit/SourceGenerator.swift
Co-Authored-By: Yonas Kolb <yonaskolb@users.noreply.github.com>
2020-03-18 17:13:29 +09:00
freddi fd267bf503 Fixed code making absolutePath at creating local package 2020-03-05 19:46:26 +09:00
freddi 83b44b93aa Reverted not necessary change 2020-03-05 19:37:05 +09:00
freddi 7a0bd7c13c Improved PBXFileReference name at localPackages 2020-03-05 19:04:55 +09:00
freddi d8bf945ca2 Fixed issue on localPackage when specified as absolute path and when using -p 2020-03-05 09:50:45 +09:00
sipao 3a9131a21a Add support On Demand Resources (#753)
* added on-demand-resources setting to project.yml

* update documents

* Apply suggestions from code review

fixed docs

Co-Authored-By: Yonas Kolb <yonaskolb@users.noreply.github.com>

* Make it possible to resourceTags convert to json

* Use sorted() instead of Array initializer

* Avoid merge assetTags if it is empty

* Changed access to resourceTags to inline

* Don't add resourceTags other than chosenBuildPhase is .resources

* update CHANGELOG.md

* update spec loading test

* add a new "generates resource tags" test case

* add resourceTags in Test Fixture and update

Co-authored-by: Yonas Kolb <yonaskolb@users.noreply.github.com>
2020-01-21 08:47:31 +11:00
yonaskolb a6493cf3fd fix typo 2019-11-20 22:36:49 +11:00
Romuald CARI 0df37029cc Fix TargetSource group behavior
When targeting a file, a folder should not be created for its directory,
only the file should appear in the specified custom group.
Moreover, if the custom groups contains actual filesystem folders, they
should map to these.
2019-11-19 15:56:24 -05:00
Romuald CARI de9c15ea1d Fix @sroebert PR based on @yonaskolb comments 2019-11-19 15:56:23 -05:00
Steven Roebert 15e615300e Added new group parameter to target sources, allowing to add them to a custom parent group (resolving #478) 2019-11-19 15:56:23 -05:00
giginet c5e9f07a53 Add tests to add intentdefinition to build source phases 2019-11-19 03:00:08 +09:00
giginet e1f520c358 Merge remote-tracking branch 'origin/master' into intent-definitions 2019-11-19 02:51:17 +09:00
yonaskolb 0e4e08bfc4 run swift format for Swift 5.1 2019-11-10 11:56:23 +11:00
giginet b1b216b1b5 Use VariantGroup 2019-11-08 04:02:26 +09:00
giginet ae75bcb2cb Localized 2019-11-08 02:52:50 +09:00
giginet decaa9d080 Generate suitable source files for localized file reference 2019-11-08 02:12:10 +09:00
yonaskolb 518d8e578b restructure test targets 2019-10-27 23:15:12 +11:00
yonaskolb d0d509c1a5 swiftformat 2019-10-27 22:37:41 +11:00
giginet e63fe6be6f Add resolveGroupPath 2019-10-16 05:57:39 +09:00
Kohki Miki 62a26b0a17 Merge branch 'master' into project-path 2019-10-09 16:36:42 +09:00
giginet 7db2d2c526 Rename to projectDirectory 2019-10-08 22:52:51 +09:00
giginet 6a4320612a Refactor 2019-10-08 22:48:42 +09:00
giginet f9b42c2d4f Resolve relativePath 2019-10-08 22:48:42 +09:00
giginet 90b018ad28 Passing relative path 2019-10-08 22:48:42 +09:00
giginet 44c7a0cae2 Pass projectDestinationDirectory 2019-10-08 22:48:42 +09:00
giginet 2c60f5effa Use relativePath for group 2019-10-08 22:48:42 +09:00
Nikita Ivanchikov 18089e3306 Fix some localized resources not being included into project groups 2019-10-08 00:35:41 +03:00
Qusic 9ea7ed11e3 Add .rcproject path to sources build phase
.rcproject directories are projects of Reality Composer app bundled in Xcode 11 or later.
2019-10-02 13:00:39 +08:00
yonaskolb 8e48c7b07f put local packages into a Packages group and add options.localPackagesGroup 2019-09-27 22:49:05 +10:00
yonaskolb 8e6195c368 make local packages relative 2019-09-27 21:43:42 +10:00
yonaskolb e9193cfb29 add support for localPackages 2019-09-27 21:36:07 +10:00
yonaskolb e3fc07d37f generate packages 2019-09-27 17:10:55 +10:00
Yuta Saito d3bf42f2ca Check sourceTree also to ensure they have same root 2019-09-22 19:30:33 +09:00
Yuta Saito e278a706fe Add comment 2019-09-21 20:03:09 +09:00
Yuta Saito 0dc4a8de41 Copy cachedGroup.children and write back only once 2019-09-21 20:00:46 +09:00
Yuta Saito fa8c71569a Check only path to avoid slow equability check 2019-09-16 15:35:24 +09:00
Brian Clymer 626bf295cb CR feedback 2019-09-01 20:09:59 -05:00
Brian Clymer 1a2efd656f Merge branch 'master' into BC-IncludesOnly 2019-09-01 15:20:08 -05:00
Brian Clymer bc6ba9b108 Address CR comments. 2019-08-31 11:57:20 -05:00
Brian Clymer 407ca12393 Perform the relative location check much faster. 2019-08-28 15:54:03 -05:00