Commit Graph

794 Commits

Author SHA1 Message Date
Yonas Kolb 20f7797df7 add applySettingPresets option 2017-10-22 19:41:54 +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 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 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 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
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
ryohey 859609158c fix localized sources 2017-10-16 11:58:21 +09:00
ryohey 2f2c89e0c1 fix localisation variant groups 2017-10-16 11:51:28 +09:00
Yonas Kolb fd2bf39b28 Merge pull request #82 from toshi0383/ts-always-embed-and-link-frameworks-for-macos
Always embed and link frameworks for macOS
2017-10-13 23:12:36 +02:00
Eric Miller 5d9c3a9ab8 Update to xcproj 0.4.0 2017-10-10 13:39:18 -05:00
mironal f6d6f17f1b sort carthage dependencies 2017-10-05 10:53:08 +09:00
toshi0383 d03fb7785e add guard for non-app target 2017-10-04 22:22:39 +09:00
toshi0383 c94de4d6cc Always embed and link frameworks for macOS 2017-10-04 22:22:39 +09:00
toshi0383 acb8963f72 Apply fix to func getCombinedBuildSettings 2017-10-04 22:21:57 +09:00
toshi0383 019efa00a9 Improve remove logic 2017-10-04 22:21:57 +09:00
toshi0383 4c838a3eec Avoid overwriting xcconfig value by presets value 2017-10-04 22:21:57 +09:00
mironal d1efa9ac64 Add outputpaths to carthage copy-framewors script
According to Carthage README, the Output Files should be set to
`carthage copy-frameworks` script.

https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos
2017-10-04 15:02:35 +09:00
toshi0383 668a75fce8 Fix typo: dependancies => dependencies 2017-10-03 00:08:39 +09:00
Yonas Kolb c23ad0033b don't add carthage dependency to copy-frameworks script if embed: false 2017-10-02 01:41:37 +02:00
Yonas Kolb 4c5401dd80 sort group files for APFS 2017-10-01 12:43:42 +02:00
Yonas Kolb fec6066d91 updated to xcproj 0.3.0 2017-10-01 11:42:07 +02:00
Yonas Kolb eef423970f filter out nulls from all yaml files including setting presets 2017-09-29 18:20:36 +02:00
Toshihiro Suzuki 4227ac243e No need carthage copy-frameworks for macOS app (#76)
* No need carthage copy-frameworks for macOS

* Update CHANGELOG.md
2017-09-29 17:51:08 +02:00
Toshihiro Suzuki 6901f8b325 Fix typo: dependancy => dependency (#75) 2017-09-29 17:34:01 +02:00
Toshihiro Suzuki a271fec18d Fixed wrong directory path for macOS (#74)
* Fixed wrong directory path for macOS

before: Carthage/Build/macOS
after: Carthage/Build/Mac

* Update CHANGELOG.md
2017-09-29 17:23:01 +02:00
Yonas Kolb 8ddc129a2f automatically set TEST_TARGET_NAME if not defined 2017-09-28 14:31:41 +02:00
Yonas Kolb 122340482c look for setting preset files in multiple places 2017-09-26 22:08:33 +02:00
Yonas Kolb 8a7bfa12fc format code 2017-09-26 14:22:15 +02:00
Yonas Kolb 1c578d1a66 escape target name in auto generated PRODUCT_BUNDLE_IDENTIFIER 2017-09-25 21:08:15 +02:00
Yonas Kolb a70c4c1821 rename old references to settings preset 2017-09-25 18:25:40 +02:00
Yonas Kolb f3a60d5358 Merge pull request #68 from yonaskolb/include_replace
Add replace syntax for Include
2017-09-25 17:33:20 +02:00
Yonas Kolb c9e8e68bc5 move bundleIdPrefix to options 2017-09-25 15:30:15 +02:00
Yonas Kolb c9c589c5ee add optional replace syntax when merging includes 2017-09-25 13:34:11 +02:00
Yonas Kolb de8f885ae3 add bundleIdPrefix for generating PRODUCT_BUNDLE_IDENTIFIER 2017-09-24 21:21:57 +02:00
Yonas Kolb 8343593bba Merge pull request #64 from yonaskolb/xcconfig
XCConfig files
2017-09-24 20:32:53 +02:00
Yonas Kolb 39c8af324c support single string for include 2017-09-24 20:22:32 +02:00
Yonas Kolb 1323117cf8 add validation for project fileGroups and configFiles 2017-09-24 19:48:42 +02:00
Yonas Kolb 8a993fd94c move spec validation into seperate file 2017-09-24 19:42:14 +02:00
Yonas Kolb 2d1ccb6d1d rename project.groups to project.fileGroups 2017-09-24 19:35:26 +02:00
Yonas Kolb 71e5b4a2f2 include project settings when checking for INFOPLIST_FILE 2017-09-24 19:21:27 +02:00
Yonas Kolb 67ad669ea5 add project xcconfig files 2017-09-23 22:48:50 +02:00
Yonas Kolb 8e3966a5b8 add groups to spec for specifying non build files 2017-09-23 22:39:15 +02:00
Yonas Kolb eb5738dbd0 fix target xcconfig files not working 2017-09-23 22:39:12 +02:00
Yonas Kolb a20885e6b4 checking build setting existence checks xcconfig files too 2017-09-23 21:31:36 +02:00
Yonas Kolb 2b4d8aa6ff update generated LastUpgradeVersion to 0900 2017-09-19 13:14:38 +02:00
Yonas Kolb a689e8f224 fix incorrect default build script shell path 2017-09-19 12:34:22 +02:00