Upgrade ERN to support RN 0.81

Author: r0h0gg6

azure/templates/system-tests.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: '18.x'
+      versionSpec: '20.x'
     displayName: 'Install Node.js'
   - script: |
       git config --global user.email "electrodenative@gmail.com"

azure/templates/unit-tests.yml

@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: '18.x'
+      versionSpec: '20.x'
     displayName: 'Install Node.js'
   - script: |
       yarn --frozen-lockfile

ern-composite-gen/src/addRNDepToPjson.ts

@@ -7,7 +7,22 @@ export async function addRNDepToPjson(dir: string, version: string) {
 
   // For React Native 0.77+, also add required dependencies
   // This is required by the new Metro config format and CLI
-  if (semver.gte(version, '0.77.0')) {
+  if (semver.gte(version, '0.81.0')) {
+    compositePackageJson.dependencies['@react-native/metro-config'] = version;
+    compositePackageJson.dependencies['@react-native/babel-preset'] = version;
+    // RN 0.81+ uses @react-native/community-cli-plugin (internal to RN monorepo)
+    compositePackageJson.dependencies[
+      '@react-native/community-cli-plugin'
+    ] = version;
+    // Add CLI packages to ensure android and ios platforms are available
+    compositePackageJson.dependencies['@react-native-community/cli'] = '15.1.3';
+    compositePackageJson.dependencies[
+      '@react-native-community/cli-platform-android'
+    ] = '15.1.3';
+    compositePackageJson.dependencies[
+      '@react-native-community/cli-platform-ios'
+    ] = '15.1.3';
+  } else if (semver.gte(version, '0.77.0')) {
     compositePackageJson.dependencies['@react-native/metro-config'] = version;
     compositePackageJson.dependencies['@react-native/babel-preset'] = version;
     // Add CLI packages to ensure android and ios platforms are available

ern-container-gen-android/src/hull/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ern-core/src/ReactNativeCli.ts

@@ -89,7 +89,9 @@ export default class ReactNativeCli {
     }
     const initCmd = `init ${projectName} ${options.join(' ')}`;
 
-    if (semver.gte(rnVersion, '0.77.0')) {
+    if (semver.gte(rnVersion, '0.81.0')) {
+      return execp(`npx @react-native-community/cli@15.1.3 ${initCmd}`);
+    } else if (semver.gte(rnVersion, '0.77.0')) {
       return execp(`npx @react-native-community/cli@15.0.1 ${initCmd}`);
     } else if (semver.gte(rnVersion, '0.60.0')) {
       return execp(

ern-core/src/android.ts

@@ -16,16 +16,16 @@ export const DEFAULT_ANDROID_GRADLE_PLUGIN_VERSION = '7.0.4';
 export const DEFAULT_RN_GRADLE_PLUGIN_VERSION = '0.0.6';
 export const DEFAULT_ANDROIDX_APPCOMPACT_VERSION = '1.1.0';
 export const DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION = '2.1.0';
-export const DEFAULT_BUILD_TOOLS_VERSION = '35.0.0';
-export const DEFAULT_COMPILE_SDK_VERSION = '35';
-export const DEFAULT_GRADLE_DISTRIBUTION_VERSION = '8.11.1';
+export const DEFAULT_BUILD_TOOLS_VERSION = '36.0.0';
+export const DEFAULT_COMPILE_SDK_VERSION = '36';
+export const DEFAULT_GRADLE_DISTRIBUTION_VERSION = '8.14.3';
 export const DEFAULT_JSC_VARIANT = 'android-jsc';
-export const DEFAULT_KOTLIN_VERSION = '2.0.21';
+export const DEFAULT_KOTLIN_VERSION = '2.1.20';
 export const DEFAULT_MIN_SDK_VERSION_PRE_RN64 = '19';
 export const DEFAULT_MIN_SDK_VERSION_POST_RN64 = '21';
 export const DEFAULT_MIN_SDK_VERSION_POST_RN77 = '24';
 export const DEFAULT_SUPPORT_LIBRARY_VERSION = '28.0.0';
-export const DEFAULT_TARGET_SDK_VERSION = '35';
+export const DEFAULT_TARGET_SDK_VERSION = '36';
 export const DEFAULT_SOURCE_COMPATIBILITY = 'VERSION_17';
 export const DEFAULT_TARGET_COMPATIBILITY = 'VERSION_17';
 const ANDROID_DEVICE_INFO = `
@@ -54,16 +54,16 @@ export function resolveAndroidVersions({
   androidGradlePlugin,
   androidxAppcompactVersion = DEFAULT_ANDROIDX_APPCOMPACT_VERSION,
   androidxLifecycleExtrnsionsVersion = DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
-  buildToolsVersion = DEFAULT_BUILD_TOOLS_VERSION,
-  compileSdkVersion = DEFAULT_COMPILE_SDK_VERSION,
-  gradleDistributionVersion = DEFAULT_GRADLE_DISTRIBUTION_VERSION,
-  kotlinVersion = DEFAULT_KOTLIN_VERSION,
+  buildToolsVersion,
+  compileSdkVersion,
+  gradleDistributionVersion,
+  kotlinVersion,
   minSdkVersion,
   reactNativeAarVersion,
   sourceCompatibility = DEFAULT_SOURCE_COMPATIBILITY,
   supportLibraryVersion = DEFAULT_SUPPORT_LIBRARY_VERSION,
   targetCompatibility = DEFAULT_TARGET_COMPATIBILITY,
-  targetSdkVersion = DEFAULT_TARGET_SDK_VERSION,
+  targetSdkVersion,
   reactNativeVersion,
 }: {
   rnGradlePlugin?: string;
@@ -95,22 +95,33 @@ export function resolveAndroidVersions({
     rnGradlePlugin ?? getReactNativeGradlePluginVersion(reactNativeVersion!);
   const resolvedAndroidGradlePlugin =
     androidGradlePlugin ?? getGradlePluginVersion(reactNativeVersion!);
+  const resolvedBuildToolsVersion =
+    buildToolsVersion ?? getDefaultBuildToolsVersion(reactNativeVersion!);
+  const resolvedCompileSdkVersion =
+    compileSdkVersion ?? getDefaultCompileSdkVersion(reactNativeVersion!);
+  const resolvedGradleDistributionVersion =
+    gradleDistributionVersion ??
+    getDefaultGradleDistributionVersion(reactNativeVersion!);
+  const resolvedKotlinVersion =
+    kotlinVersion ?? getDefaultKotlinVersion(reactNativeVersion!);
+  const resolvedTargetSdkVersion =
+    targetSdkVersion ?? getDefaultTargetSdkVersion(reactNativeVersion!);
 
   return {
     rnGradlePlugin: resolvedRNGradlePlugin,
     androidGradlePlugin: resolvedAndroidGradlePlugin,
     androidxAppcompactVersion,
     androidxLifecycleExtrnsionsVersion,
-    buildToolsVersion,
-    compileSdkVersion,
-    gradleDistributionVersion,
-    kotlinVersion,
+    buildToolsVersion: resolvedBuildToolsVersion,
+    compileSdkVersion: resolvedCompileSdkVersion,
+    gradleDistributionVersion: resolvedGradleDistributionVersion,
+    kotlinVersion: resolvedKotlinVersion,
     minSdkVersion: resolvedMinSdkVersion,
     reactNativeAarVersion,
     sourceCompatibility,
     supportLibraryVersion,
     targetCompatibility,
-    targetSdkVersion,
+    targetSdkVersion: resolvedTargetSdkVersion,
   };
 }
 
@@ -470,9 +481,48 @@ export function androidEmulatorPath(): string {
   return 'emulator';
 }
 
+function getDefaultBuildToolsVersion(reactNativeVersion: string): string {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '36.0.0';
+  }
+  return '35.0.0';
+}
+
+function getDefaultCompileSdkVersion(reactNativeVersion: string): string {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '36';
+  }
+  return '35';
+}
+
+function getDefaultGradleDistributionVersion(
+  reactNativeVersion: string,
+): string {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '8.14.3';
+  }
+  return '8.11.1';
+}
+
+function getDefaultKotlinVersion(reactNativeVersion: string): string {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '2.1.20';
+  }
+  return '2.0.21';
+}
+
+function getDefaultTargetSdkVersion(reactNativeVersion: string): string {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '36';
+  }
+  return '35';
+}
+
 // ERN Android plugins supports backward compatibility until react native version 68.
 function getGradlePluginVersion(reactNativeVersion: string): string | never {
-  if (semver.gte(reactNativeVersion, '0.77.0')) {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '8.11.0';
+  } else if (semver.gte(reactNativeVersion, '0.77.0')) {
     return '8.7.2';
   } else if (semver.gte(reactNativeVersion, '0.72.0')) {
     return '7.4.2';
@@ -490,7 +540,9 @@ function getGradlePluginVersion(reactNativeVersion: string): string | never {
 function getReactNativeGradlePluginVersion(
   reactNativeVersion: string,
 ): string | never {
-  if (semver.gte(reactNativeVersion, '0.77.0')) {
+  if (semver.gte(reactNativeVersion, '0.81.0')) {
+    return '0.81.5';
+  } else if (semver.gte(reactNativeVersion, '0.77.0')) {
     return '0.77.2';
   } else if (semver.gte(reactNativeVersion, '0.72.0')) {
     return '0.72.11';

ern-core/src/injectReactNativeVersionKeysInObject.ts

@@ -11,6 +11,7 @@ export function injectReactNativeVersionKeysInObject(
     RN_VERSION_GTE_60_1: semver.gte(reactNativeVersion, '0.60.1'),
     RN_VERSION_GTE_61: semver.gte(reactNativeVersion, '0.61.0'),
     RN_VERSION_GTE_77: semver.gte(reactNativeVersion, '0.77.0'),
+    RN_VERSION_GTE_81: semver.gte(reactNativeVersion, '0.81.0'),
     RN_VERSION_LT_54: semver.lt(reactNativeVersion, '0.54.0'),
     RN_VERSION_LT_58: semver.lt(reactNativeVersion, '0.58.0-rc.2'),
     RN_VERSION_LT_59: semver.lt(reactNativeVersion, '0.59.0'),

ern-core/src/iosUtil.ts

@@ -582,7 +582,9 @@ export const getDefaultIosDeploymentTarget = (rnVersion: string): string => {
 export const getReactNativeCodegenVersion = (
   rnVersion: string,
 ): string | null => {
-  if (semver.gte(rnVersion, '0.77.0')) {
+  if (semver.gte(rnVersion, '0.81.0')) {
+    return '0.81.5';
+  } else if (semver.gte(rnVersion, '0.77.0')) {
     return '0.77.2';
   } else if (semver.gte(rnVersion, '0.72.0')) {
     return '0.72.8';

ern-core/test/android-test.ts

@@ -209,26 +209,47 @@ describe('android.js', () => {
   });
 
   describe('resolveAndroidVersions', () => {
+    it('should return all default versions if no versions are provided [>= RN 0.81.0]', () => {
+      const versions = android.resolveAndroidVersions({
+        reactNativeVersion: '0.81.0',
+      });
+      expect(versions).deep.equal({
+        androidGradlePlugin: '8.11.0',
+        rnGradlePlugin: '0.81.5',
+        androidxAppcompactVersion: '1.1.0',
+        androidxLifecycleExtrnsionsVersion: '2.1.0',
+        buildToolsVersion: '36.0.0',
+        compileSdkVersion: '36',
+        gradleDistributionVersion: '8.14.3',
+        kotlinVersion: '2.1.20',
+        minSdkVersion: '24',
+        reactNativeAarVersion: '0.81.0',
+        sourceCompatibility: 'VERSION_17',
+        supportLibraryVersion: '28.0.0',
+        targetCompatibility: 'VERSION_17',
+        targetSdkVersion: '36',
+      });
+    });
+
     it('should return all default versions if no versions are provided [>= RN 0.77.0]', () => {
       const versions = android.resolveAndroidVersions({
         reactNativeVersion: '0.77.0',
       });
       expect(versions).deep.equal({
         androidGradlePlugin: '8.7.2',
         rnGradlePlugin: '0.77.2',
-        androidxAppcompactVersion: android.DEFAULT_ANDROIDX_APPCOMPACT_VERSION,
-        androidxLifecycleExtrnsionsVersion:
-          android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
-        buildToolsVersion: android.DEFAULT_BUILD_TOOLS_VERSION,
-        compileSdkVersion: android.DEFAULT_COMPILE_SDK_VERSION,
-        gradleDistributionVersion: android.DEFAULT_GRADLE_DISTRIBUTION_VERSION,
-        kotlinVersion: android.DEFAULT_KOTLIN_VERSION,
-        minSdkVersion: android.DEFAULT_MIN_SDK_VERSION_POST_RN77,
+        androidxAppcompactVersion: '1.1.0',
+        androidxLifecycleExtrnsionsVersion: '2.1.0',
+        buildToolsVersion: '35.0.0',
+        compileSdkVersion: '35',
+        gradleDistributionVersion: '8.11.1',
+        kotlinVersion: '2.0.21',
+        minSdkVersion: '24',
         reactNativeAarVersion: '0.77.0',
-        sourceCompatibility: android.DEFAULT_SOURCE_COMPATIBILITY,
-        supportLibraryVersion: android.DEFAULT_SUPPORT_LIBRARY_VERSION,
-        targetCompatibility: android.DEFAULT_TARGET_COMPATIBILITY,
-        targetSdkVersion: android.DEFAULT_TARGET_SDK_VERSION,
+        sourceCompatibility: 'VERSION_17',
+        supportLibraryVersion: '28.0.0',
+        targetCompatibility: 'VERSION_17',
+        targetSdkVersion: '35',
       });
     });
 
@@ -241,7 +262,7 @@ describe('android.js', () => {
         rnGradlePlugin: '0.72.11',
         androidxAppcompactVersion: android.DEFAULT_ANDROIDX_APPCOMPACT_VERSION,
         androidxLifecycleExtrnsionsVersion:
-          android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
+        android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
         buildToolsVersion: android.DEFAULT_BUILD_TOOLS_VERSION,
         compileSdkVersion: android.DEFAULT_COMPILE_SDK_VERSION,
         gradleDistributionVersion: android.DEFAULT_GRADLE_DISTRIBUTION_VERSION,
@@ -264,7 +285,7 @@ describe('android.js', () => {
         rnGradlePlugin: android.DEFAULT_RN_GRADLE_PLUGIN_VERSION,
         androidxAppcompactVersion: android.DEFAULT_ANDROIDX_APPCOMPACT_VERSION,
         androidxLifecycleExtrnsionsVersion:
-          android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
+        android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
         buildToolsVersion: android.DEFAULT_BUILD_TOOLS_VERSION,
         compileSdkVersion: android.DEFAULT_COMPILE_SDK_VERSION,
         gradleDistributionVersion: android.DEFAULT_GRADLE_DISTRIBUTION_VERSION,
@@ -287,7 +308,7 @@ describe('android.js', () => {
         rnGradlePlugin: android.DEFAULT_RN_GRADLE_PLUGIN_VERSION,
         androidxAppcompactVersion: android.DEFAULT_ANDROIDX_APPCOMPACT_VERSION,
         androidxLifecycleExtrnsionsVersion:
-          android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
+        android.DEFAULT_ANDROIDX_LIFECYCLE_EXTENSIONS_VERSION,
         buildToolsVersion: android.DEFAULT_BUILD_TOOLS_VERSION,
         compileSdkVersion: android.DEFAULT_COMPILE_SDK_VERSION,
         gradleDistributionVersion: android.DEFAULT_GRADLE_DISTRIBUTION_VERSION,

ern-runner-gen-android/test/AndroidRunnerGenerator-test.ts

@@ -127,3 +127,44 @@ describe('Test AndroidRunnerGenerator for RN version 0.77.x', () => {
     );
   });
 });
+
+describe('Test AndroidRunnerGenerator for RN version 0.81.x', () => {
+  const fixtureRunnerPath = path.join(
+    __dirname,
+    'fixtures',
+    'simple-android-runner-rn-81',
+  );
+  const generatedRunnerPath = tmp.dirSync({ unsafeCleanup: true }).name;
+  process.chdir(generatedRunnerPath);
+
+  const generatorConfig: RunnerGeneratorConfig = {
+    extra: {
+      androidConfig: {
+        artifactId: 'runner-ern-container-dummy',
+        groupId: 'com.walmartlabs.ern',
+        packageFilePath: 'com/walmartlabs/ern/dummy',
+        packageName: 'com.walmartlabs.ern.dummy',
+      },
+    },
+    mainMiniAppName: 'dummy',
+    outDir: generatedRunnerPath,
+    reactNativeVersion: '0.81.0',
+    targetPlatform: 'android',
+  };
+
+  it('should generate simple-android-runner fixture given same configuration', async () => {
+    await new AndroidRunnerGenerator().generate(generatorConfig);
+    assert(
+      sameDirContent(fixtureRunnerPath, generatedRunnerPath),
+      'Generated Android Runner project differs from simple-android-runner fixture',
+    );
+  });
+
+  it('should re-generate configuration of simple-android-runner fixture given same configuration', async () => {
+    await new AndroidRunnerGenerator().regenerateRunnerConfig(generatorConfig);
+    assert(
+      sameDirContent(fixtureRunnerPath, generatedRunnerPath),
+      'Generated Android Runner project differs from simple-android-runner fixture',
+    );
+  });
+});