diff --git a/boilerplate/package.json.ejs b/boilerplate/package.json.ejs index 7eaab50db..8be62c13a 100644 --- a/boilerplate/package.json.ejs +++ b/boilerplate/package.json.ejs @@ -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", <%_ } _%> diff --git a/src/boilerplate/index.js b/src/boilerplate/index.js index 5f0f8a358..a1174a4de 100644 --- a/src/boilerplate/index.js +++ b/src/boilerplate/index.js @@ -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) diff --git a/src/lib/react-native-version.js b/src/lib/react-native-version.js index 9d1ad4efe..de7fcbd45 100644 --- a/src/lib/react-native-version.js +++ b/src/lib/react-native-version.js @@ -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 diff --git a/templates/Podfile.ejs b/templates/Podfile.ejs index 9611cb93c..4819aea12 100644 --- a/templates/Podfile.ejs +++ b/templates/Podfile.ejs @@ -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' @@ -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' diff --git a/templates/react-native-navigation/MainApplication.java.ejs b/templates/react-native-navigation/MainApplication.java.ejs index bdb86f2bd..dc9acd2e8 100644 --- a/templates/react-native-navigation/MainApplication.java.ejs +++ b/templates/react-native-navigation/MainApplication.java.ejs @@ -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() {