This repository has been archived by the owner on Mar 12, 2020. It is now read-only.
Update Emission to 1.50, using React Native 0.54.4 #1012
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
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 |
|---|---|---|
|
|
@@ -58,38 +58,39 @@ oss: | |
| JQ := $(shell command -v jq 2> /dev/null) | ||
| RNVERSION=$(shell cd node_modules/react-native && pod ipc spec React.podspec | jq '.version' -r) | ||
| YOGAVERSION=$(shell cd node_modules/react-native/ReactCommon/yoga && pod ipc spec yoga.podspec | jq '.version' -r) | ||
| YOGA_SRC_BEFORE=yoga\/\*\*\/\*.{c,h} | ||
| YOGA_SRC_AFTER=ReactCommon\/yoga\/yoga\/\*\*\/\*.\{c,h\} | ||
| YOGA_MASTER_PODSPEC_URL = "https://raw.githubusercontent.com/facebook/react-native/master/ReactCommon/yoga/yoga.podspec" | ||
|
|
||
| update_specs_repos: | ||
| ifndef JQ | ||
| $(error "Please install jq before running `brew install jq`") | ||
| endif | ||
|
|
||
| # Comment out Yoga, as it's dealt with below in ship_yoga | ||
|
|
||
| @echo "Updating Artsy specs repo"; | ||
| pod repo update artsy | ||
|
|
||
| @echo "Creating folder in artsy specs repo"; | ||
| mkdir ~/.cocoapods/repos/artsy/React/$(RNVERSION) | ||
| # mkdir ~/.cocoapods/repos/artsy/yoga/$(YOGAVERSION) | ||
|
|
||
| @echo "Putting JSON specs in the folders"; | ||
| cd node_modules/react-native && pod ipc spec React.podspec > ~/.cocoapods/repos/artsy/React/$(RNVERSION)/React.podspec.json | ||
| # cd node_modules/react-native/ReactCommon/yoga && pod ipc spec yoga.podspec > ~/.cocoapods/repos/artsy/yoga/$(YOGAVERSION)/yoga.podspec.json | ||
|
|
||
| # @echo "Modifying Yoga to reflect the React Native repo paths" | ||
| # sed -i -e 's/$(YOGA_SRC_BEFORE)/$(YOGA_SRC_AFTER)/g' ~/.cocoapods/repos/artsy/Yoga/$(YOGAVERSION)/Yoga.podspec.json | ||
|
|
||
| @echo "Commiting the changes to our shared repo" | ||
| cd ~/.cocoapods/repos/artsy && git add . | ||
| cd ~/.cocoapods/repos/artsy && git commit -m "Shipping a new version of the React deps: v$(RNVERSION) for Emission deploys" | ||
| cd ~/.cocoapods/repos/artsy && git push | ||
|
|
||
| # Use this PR for yoga podspec | ||
| # https://github.com/facebook/react-native/pull/18492 | ||
| ship_yoga: | ||
| # curl $(YOGA_MASTER_PODSPEC_URL) > ./externals/yoga/yoga.podspec | ||
| INSTALL_YOGA_WITHOUT_PATH_OPTION="true" pod ipc spec ./externals/yoga/yoga.podspec > ./externals/yoga/yoga.podspec.json | ||
| # rm -f ./externals/yoga/yoga.podspec | ||
|
There was a problem hiding this comment. The 0.54.2 version of RN does not include facebook/react-native#18492 - so, we use the master version and run that through the pod IPC command to generate JSON to put in this repo |
||
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| V3���;K���`�M�6�s |
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 |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| version = "0.54.4" | ||
|
|
||
| source = { :git => ENV['INSTALL_YOGA_FROM_LOCATION'] || 'https://github.com/facebook/react-native.git' } | ||
| if version == '1000.0.0' | ||
| # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. | ||
| source[:commit] = `git rev-parse HEAD`.strip | ||
| else | ||
| source[:tag] = "v#{version}" | ||
| end | ||
|
|
||
| Pod::Spec.new do |spec| | ||
| spec.name = 'yoga' | ||
| spec.version = "#{version}.React" | ||
| spec.license = { :type => 'MIT' } | ||
| spec.homepage = 'https://facebook.github.io/yoga/' | ||
| spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/' | ||
|
|
||
| spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.' | ||
| spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.' | ||
|
|
||
| spec.authors = 'Facebook' | ||
| spec.source = source | ||
|
|
||
| spec.module_name = 'yoga' | ||
| spec.requires_arc = false | ||
| spec.compiler_flags = [ | ||
| '-fno-omit-frame-pointer', | ||
| '-fexceptions', | ||
| '-Wall', | ||
| '-Werror', | ||
| '-std=c++1y', | ||
| '-fPIC' | ||
| ] | ||
|
|
||
| # Pinning to the same version as React.podspec. | ||
| spec.platforms = { :ios => "8.0", :tvos => "9.2" } | ||
|
|
||
| # Set this environment variable when *not* using the `:path` option to install the pod. | ||
| # E.g. when publishing this spec to a spec repo. | ||
| source_files = 'yoga/**/*.{cpp,h}' | ||
| source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION'] | ||
| spec.source_files = source_files | ||
|
|
||
| header_files = 'yoga/{Yoga,YGEnums,YGMacros}.h' | ||
| header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION'] | ||
| spec.public_header_files = header_files | ||
| end |
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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "name": "yoga", | ||
| "version": "0.54.4.React", | ||
| "license": { | ||
| "type": "MIT" | ||
| }, | ||
| "homepage": "https://facebook.github.io/yoga/", | ||
| "documentation_url": "https://facebook.github.io/yoga/docs/api/c/", | ||
| "summary": "Yoga is a cross-platform layout engine which implements Flexbox.", | ||
| "description": "Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.", | ||
| "authors": "Facebook", | ||
| "source": { | ||
| "git": "https://github.com/facebook/react-native.git", | ||
| "tag": "v0.54.4" | ||
| }, | ||
| "module_name": "yoga", | ||
| "requires_arc": false, | ||
| "compiler_flags": [ | ||
| "-fno-omit-frame-pointer", | ||
| "-fexceptions", | ||
| "-Wall", | ||
| "-Werror", | ||
| "-std=c++1y", | ||
| "-fPIC" | ||
| ], | ||
| "platforms": { | ||
| "ios": "8.0", | ||
| "tvos": "9.2" | ||
| }, | ||
| "source_files": "ReactCommon/yoga/yoga/**/*.{cpp,h}", | ||
| "public_header_files": "ReactCommon/yoga/yoga/{Yoga,YGEnums,YGMacros}.h" | ||
| } |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code was wrong, we didn't need to ship them to our specs repo because they existed inside the public specs repo