Skip to content

Commit

Permalink
Merge branch 'gutenberg/add/featured-functionality-to-image-block' of…
Browse files Browse the repository at this point in the history
… github.com:wordpress-mobile/WordPress-iOS into gutenberg/add/featured-functionality-to-image-block
  • Loading branch information
Siobhan committed Jun 30, 2021
2 parents d552f4a + 998beb3 commit e6fff4a
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 98 deletions.
15 changes: 13 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ abstract_target 'Apps' do
## Gutenberg (React Native)
## =====================
##
gutenberg :commit => '8ba826adf28ce96c5c5c9e42b333ee1742d579f1'
gutenberg :commit => '0e26ee87659ab34756a956aff4ae24361f9cc0df'

## Third party libraries
## =====================
Expand Down Expand Up @@ -195,7 +195,7 @@ abstract_target 'Apps' do

# Production

pod 'Automattic-Tracks-iOS', '~> 0.8.5'
pod 'Automattic-Tracks-iOS', '~> 0.9.0'
# While in PR
# pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
# Local Development
Expand Down Expand Up @@ -474,4 +474,15 @@ post_install do |installer|
configuration.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' if pod_ios_deployment_target <= app_ios_deployment_target
end
end

# Flag Alpha builds for Tracks
# ============================
installer.pods_project.targets.each do |target|
next unless target.name == "Automattic-Tracks-iOS"
target.build_configurations.each do |config|
if config.name == "Release-Alpha" or config.name == "Release-Internal"
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'ALPHA=1']
end
end
end
end
Loading

0 comments on commit e6fff4a

Please sign in to comment.