Commit Graph

365 Commits

Author SHA1 Message Date
Yonas Kolb e14a85fd69 Merge pull request #113 from yonaskolb/xcproj_1.2
Update to xcproj 1.2
2017-10-28 20:11:18 +02:00
Yonas Kolb a4471e839e update to xcproj 1.2 2017-10-28 20:01:01 +02:00
Yonas Kolb 53e7b2dee9 Merge pull request #112 from mironal/add-version-option
add support --version option
2017-10-27 23:17:05 +02:00
mironal ac2a1ac2d6 add support --vesion option 2017-10-27 11:45:18 +09:00
Yonas Kolb 770b502638 change target description 2017-10-27 00:50:21 +02:00
Yonas Kolb d17099123d update version 2017-10-27 00:39:32 +02:00
Yonas Kolb 4539ead7f9 update changelog 1.3.0 2017-10-27 00:35:29 +02:00
Yonas Kolb c2136b22d6 update changelog 2017-10-27 00:31:14 +02:00
Yonas Kolb ebb945ede2 add spec validation that a spec has debug and release configs when generating a target scheme 2017-10-26 23:52:18 +02:00
Yonas Kolb e44868530f Merge pull request #111 from yonaskolb/config_reference
Partial config matching
2017-10-26 23:32:10 +02:00
Yonas Kolb ff73efa26b Merge pull request #109 from yonaskolb/ks/link-dependency
Add option for not linking dependencies
2017-10-26 22:16:58 +02:00
Keith Smiley d31f9be4bf Update documentation for link dependency 2017-10-26 13:14:01 -07:00
Yonas Kolb 57204c5054 add partial config matching documentation 2017-10-26 22:09:26 +02:00
Yonas Kolb 08079c914e make Settings.configs case insensitive 2017-10-26 21:53:16 +02:00
Yonas Kolb 11abfb0ae2 apply partial matching to Settings.configs 2017-10-26 21:50:45 +02:00
Yonas Kolb 5c65ef13b7 add setting config reference linting 2017-10-26 19:40:46 +02:00
Keith Smiley 08de6077d9 Add option for not linking dependencies
This adds a new attribute to Dependency that allows consumers to choose
to not link a dependency. This is useful for if you have this dependency
tree with static libraries:

App -> A -> Shared
App -> B -> Shared

Where A and B both share a static library dependency, that is finally
linked into App. If Shared is added to the link phase of A and B, you
end up with duplicate symbols during the link phase. With this change
consumers could set link: False on A and B's dependency on Shared, this
way Shared will get build before A and B, but not linked.
2017-10-25 15:55:49 -07:00
Yonas Kolb 014b99cb29 Merge pull request #107 from yonaskolb/duplicate_carthage_files
Fix duplicated carthage file references
2017-10-25 22:02:54 +02:00
Yonas Kolb 8e95044d55 fix carthage file references from being duplicated 2017-10-25 21:05:53 +02:00
Yonas Kolb 9f14fb88b1 Merge pull request #105 from bkase/fix-exclude-typo
Remove sourceExcludes
2017-10-25 09:31:25 +02:00
Brandon Kase 6d4449192c Remove unused sourceExcludes 2017-10-24 15:05:57 -07:00
Yonas Kolb 6e795fbc3c Merge pull request #103 from yonaskolb/spec_base_path
Move basePath into ProjectSpec
2017-10-24 22:31:46 +02:00
Yonas Kolb 2d1d81246d log explicit missing spec error 2017-10-24 22:21:21 +02:00
Yonas Kolb 779397ec8d move basePath into ProjectSpec 2017-10-24 21:30:06 +02:00
Yonas Kolb 8d1e77b9c3 update equatable 2017-10-24 11:24:34 +02:00
Yonas Kolb 174ca9b385 Merge pull request #101 from yonaskolb/setting_preset_option
Add settingPresets option
2017-10-23 12:59:26 +01:00
Yonas Kolb f3b7c2a502 Merge pull request #102 from ryohey/fix-duplicate-reference
fix duplicate file reference
2017-10-23 10:27:17 +01:00
ryohey 24175c3411 fix duplicate file reference 2017-10-23 11:49:11 +09:00
Yonas Kolb 0204f27c82 rename Options.applySettingPresets to Options.settingPresets 2017-10-22 20:37:03 +01:00
Yonas Kolb 20f7797df7 add applySettingPresets option 2017-10-22 19:41:54 +01:00
Yonas Kolb 670dc45d67 Merge pull request #100 from yonaskolb/clear_project_settings
Don't apply base project settings if config doesn't have a type
2017-10-22 19:21:08 +01:00
Yonas Kolb 55d72d649c updated changelog 2017-10-20 13:09:31 +01:00
Yonas Kolb 6a9de2208a don't apply base project settings if config doesn't have a type 2017-10-20 12:24:52 +01:00
Yonas Kolb 6135fa66ef Add slack badge to the readme 2017-10-19 18:31:09 +01:00
Yonas Kolb 09209a4e2c Merge pull request #93 from keith/ks/link-dependencies
Fix dependency framework/library linking
2017-10-19 00:14:02 +02:00
Yonas Kolb c244e31676 Merge branch 'master' into ks/link-dependencies 2017-10-19 00:13:43 +02:00
Yonas Kolb 689ac58f71 Merge pull request #95 from keith/ks/copy-resources
Allow copying of resource files from targets
2017-10-19 00:10:53 +02:00
Yonas Kolb 04c8beed33 Merge pull request #99 from yonaskolb/ks/readme-help
Correct README --help argument
2017-10-19 00:09:41 +02:00
Keith Smiley b12939c110 Merge pull request #98 from keith/ks/phony-build
Make build a PHONY task
2017-10-18 13:22:32 -07:00
Keith Smiley 84437181ee Correct README --help argument
This needs dashes, if you run it without it XcodeGen does print some
help but only because the command failed.
2017-10-18 10:40:53 -07:00
Yonas Kolb 22b1ba9045 Merge pull request #94 from keith/ks/resource-files
Exclude more file types from resources
2017-10-18 18:23:37 +02:00
Keith Smiley 98f89ee758 Make build a PHONY task
This solves the issue where if someone is generating a xcodeproj to work
on XcodeGen, and their build directories are local, this command would
assume that it should only run if something in that directory is
changed, which isn't the case, we want it to run all the time and for
swiftpm to decide if something has changed.
2017-10-18 08:58:28 -07:00
Keith Smiley 894f00428a Add tests for PBXProductType booleans 2017-10-18 08:50:55 -07:00
Keith Smiley 5c90d6189c Don't copy libraries
These should only be linked. If we add a library to the project here,
Xcode will remove it next time it touches the project
2017-10-18 08:50:55 -07:00
Keith Smiley 739b9f36f7 Link framework and library dependencies 2017-10-18 08:50:54 -07:00
Keith Smiley d24df8677c Allow copying of resource files from targets
Previously we were assuming that all targets that were not app
extensions should be added to the copy frameworks build phase, even
though we didn't have any guarantee they were actually frameworks. This
updates that to ensure that things copied in the copy frameworks phase
are actually frameworks, and then falls back to the resources phase
instead. This fixes the ability to embed bundle targets, and copy them
as resources.
2017-10-18 08:44:14 -07:00
Yonas Kolb 1572938016 Merge pull request #96 from keith/ks/watch-support
Add support for copying Watch apps
2017-10-18 14:33:36 +02:00
Keith Smiley 3ab7071703 Exclude more file types from resources
Entitlements files, gpx files, and explicit lproj directories should
never be included in a target's copy resources phase.

Ideally this would also include files with the plist extension, but
there are some outliers such as AppIntentVocabulary.plist.
2017-10-16 21:33:23 -07:00
Keith Smiley 5c39cf4e14 Add support for copying Watch apps
Watch apps aren't copied to the same place as other targets, they need
their own copy files phase with a custom path just for watch targets.
2017-10-16 21:31:27 -07:00
Yonas Kolb 98706a3875 Merge pull request #70 from ryohey/fix-localize
Fix localisation variant groups
2017-10-16 20:47:24 +02:00