Skip to content

Commit

Permalink
feat: Bump react-native to 0.61.5 (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
tido64 authored Jun 5, 2020
1 parent a2e0e47 commit dd07570
Show file tree
Hide file tree
Showing 9 changed files with 1,674 additions and 873 deletions.
333 changes: 245 additions & 88 deletions example/ios/Podfile.lock

Large diffs are not rendered by default.

335 changes: 243 additions & 92 deletions example/macos/Podfile.lock

Large diffs are not rendered by default.

15 changes: 6 additions & 9 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,16 @@
"start:macos": "react-native start --config=metro.config.macos.js"
},
"peerDependencies": {
"react": "^16.8.6",
"react-native": "^0.60.6",
"react-native-macos": "0.60.0-microsoft.79"
"react": "~16.8.6 || ~16.9.0",
"react-native": "^0.60.6 || ^0.61.5",
"react-native-macos": "^0.60 || ^0.61.39"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@react-native-community/cli": "^3.0.0",
"@react-native-community/cli-platform-android": "^3.0.0",
"@react-native-community/cli-platform-ios": "^3.0.0",
"mkdirp": "^0.5.1",
"react": "16.8.6",
"react-native": "0.60.6",
"react-native-macos": "0.60.0-microsoft.79",
"react": "16.9.0",
"react-native": "0.61.5",
"react-native-macos": "0.61.39",
"react-native-test-app": "../"
}
}
1,371 changes: 931 additions & 440 deletions example/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ios/test_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def use_test_app_internal!(target_platform)

yield ReactTestAppTargets.new(self) if block_given?

use_native_modules! '.'
use_native_modules!
end

post_install do
Expand Down
6 changes: 5 additions & 1 deletion ios/use_react_native-0.61.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# rubocop:disable Layout/LineLength

def include_react_native!(react_native, target_platform, _project_root)
def include_react_native!(react_native, target_platform, project_root)
react_native = "#{react_native}-macos" if target_platform == :macos

pod 'FBLazyVector', :path => "#{react_native}/Libraries/FBLazyVector"
Expand Down Expand Up @@ -39,6 +39,10 @@ def include_react_native!(react_native, target_platform, _project_root)
pod 'DoubleConversion', :podspec => "#{react_native}/third-party-podspecs/DoubleConversion.podspec"
pod 'glog', :podspec => "#{react_native}/third-party-podspecs/glog.podspec"
pod 'Folly', :podspec => "#{react_native}/third-party-podspecs/Folly.podspec"

# Required by `react-native-macos` otherwise it will find Boost elsewhere
boost = "#{react_native}/third-party-podspecs/boost-for-react-native.podspec"
pod 'boost-for-react-native', :podspec => boost if File.exist?(File.join(project_root, boost))
end

# rubocop:enable Layout/LineLength
20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "git",
"url": "https://github.com/microsoft/react-native-test-app.git"
},
"version": "0.0.16",
"version": "0.1.0",
"description": "react-native-test-app provides a test app for all supported platforms as a package",
"keywords": [
"android",
Expand All @@ -33,20 +33,24 @@
"dependencies": {
"@babel/core": "^7.0.0",
"@babel/runtime": "^7.0.0",
"@react-native-community/cli": "^2.6.0",
"@react-native-community/cli-platform-android": "^2.6.0",
"@react-native-community/cli-platform-ios": "^2.4.1",
"metro-react-native-babel-preset": "0.54.1",
"react": "16.8.6",
"react-native": "0.60.6",
"react-native-macos": "0.60.0-microsoft.79",
"@react-native-community/cli": "^3.0.0",
"@react-native-community/cli-platform-android": "^3.0.0",
"@react-native-community/cli-platform-ios": "^3.0.0",
"plop": "^2.6.0"
},
"peerDependencies": {
"react": "~16.8.6 || ~16.9.0",
"react-native": "^0.60.6 || ^0.61.5",
"react-native-macos": "^0.60 || ^0.61.39"
},
"devDependencies": {
"@semantic-release/git": "^9.0.0",
"eslint": "^6.8.0",
"eslint-plugin-prettier": "^3.1.2",
"prettier": "2.0.4",
"react": "16.9.0",
"react-native": "0.61.5",
"react-native-macos": "0.61.39",
"semantic-release": "^17.0.0"
},
"release": {
Expand Down
10 changes: 3 additions & 7 deletions plopfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,13 @@ module.exports = (plop) => {
dependencies: sortByKeys({
...packageJson.dependencies,
...(!exclusive || platforms === "macos"
? { "react-native-macos": "0.60.0-microsoft.79" }
? { "react-native-macos": "0.61.39" }
: undefined),
}),
devDependencies: sortByKeys({
...packageJson.devDependencies,
[testAppPackageName]: testAppPackageVersion,
mkdirp: "^1.0.0",
// TODO(tido64): Remove these when https://github.com/microsoft/react-native-test-app/pull/17 is merged
"@react-native-community/cli": "^4.3.0",
"@react-native-community/cli-platform-android": "^4.3.0",
"@react-native-community/cli-platform-ios": "^4.3.0",
"@react-native-community/eslint-config": "^0.0.5",
}),
});
},
Expand Down Expand Up @@ -191,7 +186,8 @@ module.exports = (plop) => {
"wrapper",
"gradle-wrapper.properties"
),
transform: (template) => template.replace(/5\.4\.1/, "5.6.4"),
transform: (template) =>
template.replace(/5\.4\.1/, "5.6.4").replace(/5\.5/, "5.6.4"),
});
actions.push({
type: "add",
Expand Down
Loading

0 comments on commit dd07570

Please sign in to comment.