-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1320 from wordpress-mobile/try/update_to_xcode_12
Update project file for Xcode 12 and Circle.ci configuration to use Xcode 12.
- Loading branch information
Showing
10 changed files
with
47 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,35 +3,42 @@ version: 2.1 | |
| orbs: | ||
| # Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs | ||
| ios: wordpress-mobile/[email protected] | ||
| git: wordpress-mobile/[email protected] | ||
|
|
||
| xcode_version: &xcode_version | ||
| xcode-version: "12.1.0" | ||
|
|
||
| iphone_test_device: &iphone_test_device | ||
| device: iPhone 11 | ||
| ios-version: "14.1" | ||
|
|
||
| workflows: | ||
| test_and_validate: | ||
| jobs: | ||
| - ios/test: | ||
| name: Test | ||
| xcode-version: "11.0" | ||
| <<: *xcode_version | ||
| bundle-install: false | ||
| pod-install: false | ||
| workspace: Aztec.xcworkspace | ||
| scheme: AztecExample | ||
| device: iPhone 11 | ||
| ios-version: "13.0" | ||
| <<: *iphone_test_device | ||
|
|
||
| - ios/validate-podspec: | ||
| name: Validate WordPress-Aztec-iOS.podspec | ||
| xcode-version: "11.0" | ||
| <<: *xcode_version | ||
| podspec-path: WordPress-Aztec-iOS.podspec | ||
|
|
||
| - ios/validate-podspec: | ||
| name: Validate WordPress-Editor-iOS.podspec | ||
| xcode-version: "11.0" | ||
| <<: *xcode_version | ||
| podspec-path: WordPress-Editor-iOS.podspec | ||
| # Reference WordPress-Aztec-iOS.podspec locally so we don't have to get it from the specs repo | ||
| additional-parameters: --include-podspecs=WordPress-Aztec-iOS.podspec | ||
|
|
||
| - ios/publish-podspec: | ||
| name: Publish WordPress-Aztec-iOS to Trunk | ||
| xcode-version: "11.0" | ||
| <<: *xcode_version | ||
| podspec-path: WordPress-Aztec-iOS.podspec | ||
| post-to-slack: true | ||
| filters: | ||
|
|
@@ -43,7 +50,7 @@ workflows: | |
| - ios/publish-podspec: | ||
| name: Publish WordPress-Editor-iOS to Trunk | ||
| requires: [ "Publish WordPress-Aztec-iOS to Trunk" ] | ||
| xcode-version: "11.0" | ||
| <<: *xcode_version | ||
| podspec-path: WordPress-Editor-iOS.podspec | ||
| post-to-slack: true | ||
| filters: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,9 +23,8 @@ Pod::Spec.new do |s| | |
|
|
||
| s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS' | ||
| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' | ||
| s.license = { :type => 'MPLv2', :file => 'LICENSE' } | ||
| s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } | ||
| s.author = { 'Automattic' => '[email protected]', 'Diego Rey Mendez' => '[email protected]', 'Sergio Estevao' => '[email protected]', 'Jorge Leandro Perez' => '[email protected]' } | ||
| s.social_media_url = "http://twitter.com/WordPressiOS" | ||
| s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } | ||
| s.ios.deployment_target = '11.0' | ||
| s.swift_version = '5.0' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,13 +23,11 @@ Pod::Spec.new do |s| | |
|
|
||
| s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS' | ||
| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' | ||
| s.license = { :type => 'MPLv2', :file => 'LICENSE' } | ||
| s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } | ||
| s.author = { 'Automattic' => '[email protected]', 'Diego Rey Mendez' => '[email protected]', 'Sergio Estevao' => '[email protected]', 'Jorge Leandro Perez' => '[email protected]' } | ||
| s.social_media_url = "http://twitter.com/WordPressiOS" | ||
| s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } | ||
| s.ios.deployment_target = '11.0' | ||
| s.swift_version = '5.0' | ||
|
|
||
| s.module_name = "WordPressEditor" | ||
| s.source_files = 'WordPressEditor/WordPressEditor/Classes/**/*' | ||
| s.resources = 'WordPressEditor/WordPressEditor/Assets/**/*' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters