Commit Graph

328 Commits

Author SHA1 Message Date
Yonas Kolb bd7e0b7564 Merge pull request #788 from alexruperez/swift-package-manager_dynamic-packages_embed-and-sign_fix
Fix #784 Swift Package Manager (Embed & Sign) for dynamic packages.
2020-02-29 12:38:39 +11:00
Bryan Summersett 7c35c25468 Revert "Add Base to known regions even if one doesn't exist"
This reverts commit 98472a3d88.
2020-02-26 18:31:14 -08:00
Ken Tominaga f510b44186 Set TEST_TARGET_NAME only when a project has UITest bundle (#792)
* Set `TEST_TARGET_NAME` only for UITest

* Update CHANGELOG.md
2020-02-26 09:26:35 -06:00
Alex Rupérez 54ec2ed76f Only embed SPM dependencies when declared in project.yml 2020-02-26 15:02:13 +01:00
Alex Rupérez 29b33e0a75 Fix #784 Swift Package Manager (Embed & Sign) for dynamic packages. 2020-02-25 12:20:25 +01:00
Ken Tominaga e3f8ae9e85 Set defaultConfigurationName for every target in a project 2020-02-24 16:57:36 -08:00
yonaskolb ce787d9e40 use mxcl/Version to fix parsing 2020-02-07 10:49:28 +11:00
yonaskolb d966e9d610 fix legacy targets dependencies 2020-02-07 10:09:09 +11:00
Yonas Kolb f2def422c5 Reorder build phases (#768)
* update changelog

* moved `Copy Bundle Resources` to after `Link with Libraries` build phase
2020-02-02 10:39:35 +11:00
yonaskolb c55af41047 update PBXFileElement sort methods 2020-02-02 09:54:59 +11:00
Christopher Rogers 5966e294e7 Stabilize sorting of groups with duplicate names/paths (#671)
* Stabilize sorting of groups with duplicate names/paths

For example, previously a group with (name: nil, path: "Sources") would be considered equal to (name: "Sources", path: "../Sources"), even though they are distinct groups.

* Remove Comparable conformance from PBXFileElement

...as it isn't compatible with its Equatable conformance.

Renamed localizedStandardCompare to reflect the fact that PBXFileElement no longer has an inherent order.

* Update changelog
2020-02-02 09:46:17 +11:00
Evan Coleman 6bfd620549 Support external target dependencies via subprojects (#701)
* Allow external target dependencies via subprojects

* Update CHANGELOG

* Update ProjectSpec

* Fix test

* Use existing fixture for test

* Sort subprojects by name

* Throw subproject generation error instead of crashing

* Cleanup target dependency generation

* Update test fixture project

* Combine extentions in Linkage

* Update XcodeProj to 7.7.0

* Update CHANGELOG.md

* Update ProjectSpec.md

Co-authored-by: Yonas Kolb <yonaskolb@users.noreply.github.com>
2020-02-02 09:44:56 +11: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
Sho Ikeda a4624d3e18 Don't add framework dependency's directory to FRAMEWORK_SEARCH_PATHS if it is implicit
Because we assume the dependency is in BUILT_PRODUCTS_DIR.

Co-authored-by: yutailang0119 <muta.yutaro@gmail.com>
2020-01-06 23:10:14 +09:00
Yuta Saito 6abca395bc Merge branch 'master' into katei/add-bundle-dependency 2019-12-01 22:16:14 +09:00
Atsushi Kiwaki 73c52f5898 Fixed unnecessary dependencies related to SwiftPM (#726) 2019-11-27 12:42:14 -06:00
Yuta Saito 46925cdd7d Separate Resources and Bundles 2019-11-20 16:24:05 +09:00
Yuta Saito 7669d60d66 Add copying bundles phase to trigger building Bundle 2019-11-18 19:14:12 +09:00
Yuta Saito e336f56093 Support .bundle dependency 2019-11-18 18:07:46 +09:00
yonaskolb 0e4e08bfc4 run swift format for Swift 5.1 2019-11-10 11:56:23 +11:00
yonaskolb 44f9ffa51a formatting 2019-11-10 11:38:53 +11:00
Kohki Miki 03076f40eb Support Static Frameworks for Carthage dependencies (#688) 2019-11-07 11:03:26 -06:00
wag-miles c5905581d5 Fix header phase for static frameworks (#705) 2019-11-06 14:09:20 -06:00
Romuald Cari 292cee1f6e Fixing link directive on dependencies (#703)
PR #624 introduced a bug with operator priorities discarding false link settings
for dependencies when the target is an executable and the dependency a static
library. This PR fixes that.
2019-10-31 15:32:17 -05:00
Bryan Summersett 98472a3d88 Add Base to known regions even if one doesn't exist 2019-10-29 15:33:52 -07:00
yonaskolb d0d509c1a5 swiftformat 2019-10-27 22:37:41 +11:00
Malcolm Jarvis d22ab944c4 Fix macOS unit test target TEST_HOST (#696)
Resolves #695

Previously, macOS unit test targets would appear to have no test host.

By manually setting the test host in Xcode on the fixture project, I discovered that macOS test hosts require an additional `Contents/MacOS/` path component before the product name.

We can manually detect the platform when setting the test host and as such generate the host correctly for macOS unit test targets.
2019-10-24 11:12:00 -05:00
giginet edac4a355b Resolve Info.plist path 2019-10-23 18:58:40 +09:00
Kohki Miki 2166a0387e Adding a default argument for backward compatibility. 2019-10-22 03:08:48 +09:00
giginet 7db2d2c526 Rename to projectDirectory 2019-10-08 22:52:51 +09:00
giginet 44c7a0cae2 Pass projectDestinationDirectory 2019-10-08 22:48:42 +09: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 41453595cc added package target dependency with XcodeProj 7.1.0 2019-09-27 20:49:32 +10:00
yonaskolb 6c9b814385 don't link packages to static libraries 2019-09-27 19:00:32 +10:00
yonaskolb 98ed4465aa add stub of swift package target dependency 2019-09-27 19:00:32 +10:00
yonaskolb e3fc07d37f generate packages 2019-09-27 17:10:55 +10:00
Roman Podymov 0f628f3533 Merge pull request #1 from yonaskolb/master
Update code
2019-09-23 11:45:39 +02:00
Roman Podymov a275d666cf swiftlint autocorrect 2019-09-23 09:44:06 +02:00
Roman Podymov c190fba8bc Use .valueArray when possible, removed redundant Array() 2019-09-23 09:41:31 +02:00
Yuta Saito 923a60fb63 Add dylib sdk for TestProject 2019-09-10 23:09:27 +09:00
yonaskolb d921d14259 make format_code 2019-09-01 22:02:53 +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
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
Andrés Cecilia Luque 3baa3b3e4d Updated compatibilityVersion 2019-05-07 18:43:17 +02: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 09801e4b41 Remove unnecessary condition 2019-04-08 19:52:42 -07: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