Skip to content

Commit

Permalink
upgrade react-native to v0.61.0
Browse files Browse the repository at this point in the history
remove dependencies supplied by the react-native template
specify iOS version for detox until iOS 13 is supported
reorganize azure-pipelines stage to list apple simulators in display-tools step
update azure-pipelines to macos 10.14
fix login e2e tests
  • Loading branch information
ruddell committed Nov 17, 2019
1 parent 7b26e1c commit 87871b9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 21 deletions.
1 change: 0 additions & 1 deletion boilerplate/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"ignite-jhipster": "<%= props.packageVersion %>",
"@react-native-community/eslint-config": "0.0.5",
<%_ if (!props.skipCommitHook) { _%>
"lint-staged": "9.3.0",
<%_ } _%>
Expand Down
10 changes: 0 additions & 10 deletions src/boilerplate/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,6 @@ async function install(context) {
spinner.succeed(`linked native libraries`)
spinner.stop()

// patch test scheme to not build for running
// https://github.com/react-native-community/cli/issues/462 (issue)
// https://github.com/facebook/react-native/issues/4210 (workaround)
await ignite.patchInFile(`ios/${name}.xcodeproj/xcshareddata/xcschemes/${name}.xcscheme`, {
replace: `buildForRunning = "YES"
buildForProfiling = "NO"`,
insert: `buildForRunning = "NO"
buildForProfiling = "NO"`,
})

// if JDL was passed to generate the app, generate any entities
if (parameters.options.jdl) {
await importEntityJdl.run(context)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/react-native-version.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { pathOr, is } = require('ramda')

// the default React Native version for this boilerplate
const REACT_NATIVE_VERSION = '0.60.5'
const REACT_NATIVE_VERSION = '0.61.0'
// https://github.com/react-native-community/react-native-releases/blob/master/CHANGELOG.md

// where the version lives under gluegun
Expand Down
15 changes: 11 additions & 4 deletions templates/Podfile.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ

target '<%= props.name %>' do
# Pods for <%= props.name %>
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
pod 'React', :path => '../node_modules/react-native/'
pod 'React-Core', :path => '../node_modules/react-native/React'
pod 'React-DevSupport', :path => '../node_modules/react-native/React'
pod 'React-Core', :path => '../node_modules/react-native/'
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
Expand All @@ -15,13 +20,15 @@ target '<%= props.name %>' do
pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'

pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'

pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
Expand Down
8 changes: 3 additions & 5 deletions templates/react-native-navigation/MainApplication.java.ejs
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
package com.<%= props.packageName %>;

import android.app.Application;
import android.util.Log;
import android.content.Context;

import com.facebook.react.PackageList;
import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.ReactApplication;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import java.util.List;

import com.reactnativenavigation.NavigationApplication;
import com.reactnativenavigation.react.NavigationReactNativeHost;
import com.reactnativenavigation.react.ReactGateway;

import java.util.List;

public class MainApplication extends NavigationApplication {
@Override
protected ReactGateway createReactGateway() {
Expand Down

0 comments on commit 87871b9

Please sign in to comment.