diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts index 6c5e3f1834..54feebc407 100644 --- a/packages/core/src/plugins/index.ts +++ b/packages/core/src/plugins/index.ts @@ -707,6 +707,7 @@ export const overrideFileContents = (dest: string, override: Record = PackageList(this).packages.apply { @@ -29,7 +24,7 @@ override val reactNativeHost: ReactNativeHost = // add(MyReactNativePackage()) } - override fun getJSMainModuleName(): String = "{{ENTRY_FILE}}" + override fun getJSMainModuleName(): String = "index" override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG @@ -42,13 +37,13 @@ override val reactNativeHost: ReactNativeHost = override fun onCreate() { super.onCreate() -{{PLUGIN_DEBUG_SERVER}} + SoLoader.init(this, false) if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. load() } -{{PLUGIN_ON_CREATE}} ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager) } -} \ No newline at end of file +} + diff --git a/packages/rnv/pluginTemplates/@react-native-community/cli-platform-ios/overrides@11.3.7.json b/packages/rnv/pluginTemplates/@react-native-community/cli-platform-ios/overrides@11.3.7.json index e6016b6131..e91237b69c 100644 --- a/packages/rnv/pluginTemplates/@react-native-community/cli-platform-ios/overrides@11.3.7.json +++ b/packages/rnv/pluginTemplates/@react-native-community/cli-platform-ios/overrides@11.3.7.json @@ -2,12 +2,6 @@ "overrides": { "build/tools/listIOSDevices.js": { "rawOutput.filter(device => !device.platform.includes('appletv') && !device.platform.includes('macos')).sort(device => device.simulator ? 1 : -1).map(device => {": "rawOutput.sort(device => device.simulator ? 1 : -1).map(device => { // <= PATCHED BY RENATIVE" - }, - "build/tools/findMatchingSimulator.js": { - "if (!version.includes('iOS')) {": "if (!version.includes('iOS') && !version.includes('tvOS')) { // <= PATCHED BY RENATIVE" - }, - "build/commands/runIOS/index.js": { - "if (device.type === 'simulator') {\n return runOnSimulator(xcodeProject, scheme, modifiedArgs);": "if (device.type === 'simulator') {\n return runOnSimulator(xcodeProject, scheme, modifiedArgs, device); // <= PATCHED BY RENATIVE" } } -} \ No newline at end of file +} diff --git a/packages/sdk-android/src/kotlinParser.ts b/packages/sdk-android/src/kotlinParser.ts index ee46e1462e..fb7a81f9a1 100644 --- a/packages/sdk-android/src/kotlinParser.ts +++ b/packages/sdk-android/src/kotlinParser.ts @@ -60,11 +60,15 @@ export const parseMainApplicationSync = (c: Context) => { const javaPackageArray = appId?.split('.') || []; const javaPackagePath = `app/src/main/java/${javaPackageArray.join('/')}`; - mkdirSync(path.join(appFolder, javaPackagePath), { recursive: true }); + console.log(javaPackageArray, 'javaPackageArray'); + console.log(javaPackagePath, 'javaPackagePath'); + // mkdirSync(path.join(appFolder, javaPackagePath), { recursive: true }); const templatePath = 'app/src/main/java/rnv_template/MainApplication.kt'; - const applicationPath = `${javaPackagePath}/MainApplication.java`; + // const applicationPath = `${javaPackagePath}/MainApplication.java`; const bundleAssets = getConfigProp(c, platform, 'bundleAssets'); + console.log(templatePath, 'templatePath'); + const bundleDefault = JS_BUNDLE_DEFAULTS[platform]; const bundleFile: string = getGetJsBundleFile(c, platform) || bundleAssets @@ -111,7 +115,7 @@ export const parseMainApplicationSync = (c: Context) => { writeCleanFile( getBuildFilePath(c, platform, templatePath), - path.join(appFolder, applicationPath), + path.join(appFolder, templatePath), injects, undefined, c @@ -123,14 +127,9 @@ export const parseMainActivitySync = (c: RnvContext) => { const { platform } = c; const appId = getAppId(c, c.platform); - // console.log('appId', appId); - const javaPackageArray = appId?.split('.') || []; - - const javaPackagePath = `app/src/main/java/${javaPackageArray.join('/')}`; - mkdirSync(path.join(appFolder, javaPackagePath), { recursive: true }); const templatePath = 'app/src/main/java/rnv_template/MainActivity.kt'; - const activityPath = `${javaPackagePath}/MainActivity.java`; + const templateAndroid = getConfigProp(c, platform, 'templateAndroid', {}); @@ -167,7 +166,7 @@ export const parseMainActivitySync = (c: RnvContext) => { writeCleanFile( getBuildFilePath(c, platform, templatePath), - path.join(appFolder, activityPath), + path.join(appFolder, templatePath), injects, undefined, c @@ -178,10 +177,9 @@ export const parseSplashActivitySync = (c: Context) => { const appFolder = getAppFolder(c); const { platform } = c; const appId = getAppId(c, c.platform); - const javaPackageArray = appId?.split('.') || []; + const splashTemplatePath = 'app/src/main/java/rnv_template/SplashActivity.kt'; - const splashPath = `app/src/main/java/${javaPackageArray.join('/')}/SplashActivity.java`; // TODO This is temporary ANDROIDX support. whole kotlin parser will be refactored in the near future const enableAndroidX = getConfigProp(c, platform, 'enableAndroidX', true); @@ -205,7 +203,7 @@ export const parseSplashActivitySync = (c: Context) => { writeCleanFile( getBuildFilePath(c, platform, splashTemplatePath), - path.join(appFolder, splashPath), + path.join(appFolder, splashTemplatePath), injects, undefined, c diff --git a/packages/sdk-android/templates/gradleProject/gradle/wrapper/gradle-wrapper.properties b/packages/sdk-android/templates/gradleProject/gradle/wrapper/gradle-wrapper.properties index 49941b152d..e734ca834a 100644 --- a/packages/sdk-android/templates/gradleProject/gradle/wrapper/gradle-wrapper.properties +++ b/packages/sdk-android/templates/gradleProject/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-{{INJECT_GRADLE_WRAPPER_VERSION}}-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/template-starter/Gemfile b/packages/template-starter/Gemfile index 39233011e2..dac3c4204e 100644 --- a/packages/template-starter/Gemfile +++ b/packages/template-starter/Gemfile @@ -4,5 +4,5 @@ source 'https://rubygems.org' ruby ">= 2.6.10" gem 'cocoapods', '~> 1.13' -gem 'activesupport', '~> 7.0', '<= 7.0.8' +gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' diff --git a/packages/template-starter/renative.json b/packages/template-starter/renative.json index c3fc85f548..5b52bcc80c 100644 --- a/packages/template-starter/renative.json +++ b/packages/template-starter/renative.json @@ -145,7 +145,8 @@ "react-dom": "source:rnv", "react-native-gesture-handler": { "version": "2.14.1", - "disablePluginTemplateOverrides": false + "disablePluginTemplateOverrides": true + }, "@react-native-community/cli-platform-ios": { "version": "11.3.7",