Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions packages/helloworld/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,6 @@ react {
*/
def enableProguardInReleaseBuilds = false

/**
* The preferred build flavor of JavaScriptCore (JSC)
*
* For example, to use the international variant, you can use:
* `def jscFlavor = "io.github.react-native-community:jsc-android-intl:2026004.+"`
*
* The international variant includes ICU i18n library and necessary data
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
* give correct results when using with locales other than en-US. Note that
* this variant is about 6MiB larger per architecture than default.
*/
def jscFlavor = "io.github.react-native-community:jsc-android:2026004.+"

android {
ndkVersion rootProject.ext.ndkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
Expand Down Expand Up @@ -128,10 +115,5 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
implementation jscFlavor
}
implementation("com.facebook.react:hermes-android")
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MainApplication : Application(), ReactApplication {
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG

override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
override val isHermesEnabled: Boolean = true
}

override val reactHost: ReactHost
Expand Down
8 changes: 2 additions & 6 deletions scripts/release-testing/test-e2e-local.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ async function testRNTesterAndroid(
maybeLaunchAndroidEmulator();

console.info(
`We're going to test the ${
argv.hermes === true ? 'Hermes' : 'JSC'
} version of RNTester Android with the new Architecture enabled`,
`We're going to test RNTester Android with the new Architecture enabled`,
);

// Start the Metro server so it will be ready if the app can be built and installed successfully.
Expand All @@ -180,9 +178,7 @@ async function testRNTesterAndroid(
// Github Actions zips all the APKs in a single archive
console.info('Start Downloading APK');
const rntesterAPKURL =
argv.hermes === true
? await ciArtifacts.artifactURLForHermesRNTesterAPK(emulatorArch)
: await ciArtifacts.artifactURLForJSCRNTesterAPK(emulatorArch);
await ciArtifacts.artifactURLForRNTesterAPK(emulatorArch);

ciArtifacts.downloadArtifact(rntesterAPKURL, downloadPath);
const unzipFolder = path.join(ciArtifacts.baseTmpPath(), 'rntester-apks');
Expand Down
13 changes: 3 additions & 10 deletions scripts/release-testing/utils/github-actions-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,10 @@ function downloadArtifact(
exec(command, {stdio: 'inherit'});
}

async function artifactURLForJSCRNTesterAPK(
async function artifactURLForRNTesterAPK(
emulatorArch /*: string */,
) /*: Promise<string> */ {
return getArtifactURL('rntester-jsc-debug');
}

async function artifactURLForHermesRNTesterAPK(
emulatorArch /*: string */,
) /*: Promise<string> */ {
return getArtifactURL('rntester-hermes-debug');
return getArtifactURL('rntester-debug');
}

async function artifactURLForJSCRNTesterApp() /*: Promise<string> */ {
Expand Down Expand Up @@ -254,8 +248,7 @@ function baseTmpPath() /*: string */ {
module.exports = {
initialize,
downloadArtifact,
artifactURLForJSCRNTesterAPK,
artifactURLForHermesRNTesterAPK,
artifactURLForRNTesterAPK,
artifactURLForJSCRNTesterApp,
artifactURLForHermesRNTesterApp,
artifactURLForMavenLocal,
Expand Down
Loading