Commit Graph
427 Commits
Author SHA1 Message Date
Yonas Kolb 3a67d0e53c Merge branch 'master' into disable_main_thread_checker 2019-09-01 02:53:28 +10:00
Yuta Saito 458ba9de89 Allow to link dylib into static library only when 'link' is true (#635)
* Allow to link dylib into static library only when 'link' is true

* Add test case to proof that links only when true

* Update CHANGELOG.md
2019-08-28 13:52:27 -05:00
Keith Smiley acb56f8866 Ignore files with orig extension
This is useful for multi-developer projects where you don't want to
delete these files for everyone, since they might actually want them,
but they still aren't useful to show in Xcode.

Fixes https://github.com/yonaskolb/XcodeGen/issues/310
2019-08-24 11:57:10 -07:00
haritowa 8e21cdfdb1 Include unique file only once
Fixes #574
2019-08-19 12:42:53 -05:00
Miles Hollingsworth 30ef0fb3be update integration test 2019-08-13 16:53:00 -07:00
Miles Hollingsworth d32a710fa2 add disable main thread checker for test actions 2019-08-02 09:21:22 -07:00
yonaskolb 231d4ff659 regen carthage project 2019-06-26 17:13:08 +10:00
yonaskolb 401df4042a fix swift 5.1 warnings 2019-06-26 17:02:42 +10:00
yonaskolb af2ee82a79 regen fixtures 2019-06-26 16:52:20 +10:00
yonaskolb d71612cbe0 update code to new XcodeProj 2019-06-26 16:49:10 +10:00
yonaskolb 745be5fc1d update import name 2019-06-26 16:49:10 +10:00
Tom Quist d3b096a525 Add additional spec for variable expension in combination with template attributes 2019-06-19 22:32:01 +02:00
Tom Quist c8aef74a93 Fix review suggestions 2019-06-17 00:01:33 +02:00
Tom Quist 25260963c7 Add environment variable expansion
closes #587
2019-06-16 23:48:58 +02:00
Min Kim e034dc982f Merge branch 'master' into min/no_codegen 2019-06-13 21:38:52 -07:00
Yonas Kolb 06179ebda7 Change compatibilityVersion to Xcode 10.0 (#581)
Change compatibilityVersion to Xcode 10.0
2019-06-14 10:57:12 +10:00
min efb5951d13 Allow more flexibility by accepting an [String] for attributes 2019-05-11 08:36:24 -07:00
Andras Kadar bb311b1ca7 Allow skipping tests in test targets 2019-05-08 08:31:21 +02:00
min 60a0f64416 Add support for no_codegen settings ATTRIBUTE 2019-05-07 20:42:44 -07:00
Andrés Cecilia Luque ef85a2cf10 Generate fixtures 2019-05-07 18:57:21 +02:00
Andrés Cecilia Luque 3baa3b3e4d Updated compatibilityVersion 2019-05-07 18:43:17 +02:00
ryohey 0889882aac Add test for JSON encoding 2019-04-20 12:12:26 +09:00
Yonas Kolb 0c1ec6f677 Merge pull request #550 from sroebert/master
Fixed flattening of relative paths (#525)
2019-04-09 21:57:39 +10:00
Yonas Kolb 17db27bb9d Merge pull request #558 from KhaosT/fix-embed-watch-target
Fix Carthage dependencies for watchOS target
2019-04-09 21:47:45 +10:00
Tian Zhang a5f0a9f7ee Fix ITMS-90539
Fix embed condition

Revert "Fix embed condition"

This reverts commit fc586863aad7cda8fc506e02bed10717dae66638.

separate condition
2019-04-08 19:52:42 -07:00
Kryštof Matěj 0533dda0a6 Added support for custom framework root 2019-04-08 15:41:06 +02:00
Steven Roebert d12bd0a426 Added unit test for testing the flattening of relative paths #(550) 2019-04-07 13:05:01 +02:00
Yonas Kolb 2fe9b546ce Merge pull request #555 from yonaskolb/xcode_10.2
Update default settings to Xcode 10.2
2019-04-06 20:46:56 +11:00
yonaskolb c73bad3312 Fix optional file sources 2019-04-04 23:32:55 +11:00
yonaskolb d71bcb5885 generate carthage fixture 2019-04-02 23:13:37 +11:00
yonaskolb a7613064b4 update latest xcode version to 10.2 2019-04-02 22:44:05 +11:00
yonaskolb 401dd772eb remove ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES 2019-04-02 22:44:05 +11:00
yonaskolb f69fdb508d set SWIFT_COMPILATION_MODE in release to wholemodule 2019-04-02 22:44:05 +11:00
yonaskolb 93fb985732 use sdk default for SWIFT_OPTIMIZATION_LEVEL in release config (-O) 2019-04-02 22:43:36 +11:00
yonaskolb 27c588a193 update default swift version to 5.0 2019-04-02 22:42:18 +11:00
yonaskolb 16bc081944 update to xcodeproj 6.7 2019-04-01 20:15:38 +11:00
yonaskolb 3311b4d321 fix TestProject building 2019-03-27 19:54:11 +11:00
yonaskolb ad276a8bc8 support Swift 5 2019-03-27 19:00:20 +11:00
yonaskolb fa156c1028 Swiftformat 2019-03-25 21:11:29 +11:00
yonaskolb bcbc83dd75 rename includeCarthageRelatedDependencies to findCarthageFrameworks and includeRelated to findFrameworks 2019-03-24 22:59:29 +11:00
yonaskolb 5accd0e095 just return framework strings from version files 2019-03-24 22:59:29 +11:00
yonaskolb 034f84e3bb add tests for de-duplicated carthage version references 2019-03-24 22:59:29 +11:00
yonaskolb c325176338 split Carthage fixtures up 2019-03-24 22:59:29 +11:00
yonaskolb 8c441d83e4 extracted CarthageVersionLoader and refactored 2019-03-24 20:23:49 +11:00
yonaskolb 3289fdc797 fix include relative sources in mixed arrays 2019-03-24 17:56:43 +11:00
yonaskolb c9de565641 make sure to still handle platform specific templates 2019-03-24 17:24:55 +11:00
Yonas Kolb 94e08a78b5 Fix multi-platform target templates 2019-03-24 17:17:55 +11:00
Tom Quist aaae772d0e Add ability to define templateAttributes within a target
This allows parameterizing templates. Also change
placeholder syntax to `${placeholderName}` also for
existing placeholders `$target_name`and `$platform`
and generate warnings when using the old placeholder
syntax.
2019-03-17 14:55:15 +01:00
Yonas Kolb 8dd2ec89cc Merge pull request #534 from tomquist/support-nested-templates
Add support for nested templates
2019-03-17 21:55:25 +11:00
Tom Quist 0c2554db2b Add support for nested templates
It would be convenient if templates could be nested, which means
a template can be based on another template.

This change implements support for nested templates. It avoids
cycles by just ignoring templates that have already been visited
when collecting the set of templates to use.
2019-03-17 11:29:50 +01:00