Skip to content

fix(android): Remove isNewArchitectureEnabled check #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrieldonadel wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −29
Open

fix(android): Remove isNewArchitectureEnabled check #1047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da44d89
fix(android): Remove isNewArchitectureEnabled check
gabrieldonadel Dec 15, 2025
e5867ff
Update android/build.gradle
gabrieldonadel Dec 15, 2025
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
44 changes: 15 additions & 29 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,9 @@ buildscript {
}
}

def isNewArchitectureEnabled() {
return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'


if (isNewArchitectureEnabled()) {
apply plugin: 'com.facebook.react'
}
apply plugin: 'com.facebook.react'

def getExtOrDefault(name) {
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['PagerView_' + name]
Expand All @@ -42,7 +34,7 @@ if(shouldUseNameSpace){
manifestContent = manifestContent.replaceAll(
PACKAGE_PROP,
''
)
)
} else {
if(!manifestContent.contains("$PACKAGE_PROP")){
manifestContent = manifestContent.replace(
Expand Down Expand Up @@ -89,11 +81,11 @@ android {
defaultConfig {
minSdkVersion getExtOrIntegerDefault('minSdkVersion')
targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"

buildConfigField "String", "CODEGEN_MODULE_REGISTRATION", (isNewArchitectureEnabled() && registrationCompat ? "\"${codegenViewModuleName}_registration\"" : "null")
buildConfigField "String", "CODEGEN_MODULE_REGISTRATION", (registrationCompat ? "\"${codegenViewModuleName}_registration\"" : "null")

if (isNewArchitectureEnabled() && registrationCompat) {
if (registrationCompat) {
def reactAndroidProject = project(':ReactAndroid')
externalNativeBuild {
ndkBuild {
Expand All @@ -113,8 +105,8 @@ android {
}
}

if (isNewArchitectureEnabled() && registrationCompat) {
// We configure the NDK build only if you decide to opt-in for the New Architecture.
if (registrationCompat) {
// We configure the NDK build when registrationCompat is enabled.
externalNativeBuild {
ndkBuild {
path "Android.mk"
Expand All @@ -138,14 +130,10 @@ android {
}
sourceSets {
main {
if (isNewArchitectureEnabled()) {
java.srcDirs += [
"src/fabric/java",
"${project.buildDir}/generated/source/codegen/java"
]
} else {
java.srcDirs += ["src/paper/java"]
}
java.srcDirs += [
"src/fabric/java",
"${project.buildDir}/generated/source/codegen/java"
]
}
}
}
Expand Down Expand Up @@ -229,10 +217,8 @@ dependencies {
implementation 'androidx.viewpager2:viewpager2:1.1.0'
}

if (isNewArchitectureEnabled()) {
react {
jsRootDir = file("../src")
libraryName = codegenViewLibraryName
codegenJavaPackageName = "com.reactnativepagerview"
}
react {
jsRootDir = file("../src")
libraryName = codegenViewLibraryName
codegenJavaPackageName = "com.reactnativepagerview"
}