Skip to content
Merged
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: 11 additions & 9 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@ def supportsNamespace() {
apply plugin: 'org.jlleitschuh.gradle.ktlint'
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
//if (isNewArchitectureEnabled()) {
// apply plugin: 'com.facebook.react'
//}
if (isNewArchitectureEnabled()) {
apply plugin: 'com.facebook.react'
}

android {
if (supportsNamespace()) {
namespace 'com.mparticle.react'
buildFeatures.buildConfig = true
buildFeatures {
buildConfig = true
}
sourceSets {
main {
manifest.srcFile "src/main/AndroidManifestNew.xml"
Expand All @@ -65,15 +67,15 @@ android {
targetSdkVersion 33
versionCode 2
versionName "2.0.0"
//buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
}
sourceSets {
main {
//if (isNewArchitectureEnabled()) {
// java.srcDirs += ['src/newarch/java']
//} else {
if (isNewArchitectureEnabled()) {
java.srcDirs += ['src/newarch/java']
} else {
java.srcDirs += ['src/oldarch/java']
//}
}
}
}

Expand Down
29 changes: 0 additions & 29 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,3 @@ android.useAndroidX=true

# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.125.0

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
# ./gradlew <task> -PreactNativeArchitectures=x86_64
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64

# Use this property to enable support to the new architecture.
# This will allow you to use TurboModules and the Fabric render in
# your application. You should enable this flag either if you want
# to write custom TurboModules/Fabric components OR use libraries that
# are providing them.
newArchEnabled=false

# The hosted JavaScript engine
# Supported values: expo.jsEngine = "hermes" | "jsc"
expo.jsEngine=jsc

# Enable GIF support in React Native images (~200 B increase)
expo.gif.enabled=true
# Enable webp support in React Native images (~85 KB increase)
expo.webp.enabled=true
# Enable animated webp support (~3.4 MB increase)
# Disabled by default because iOS doesn't support animated webp
expo.webp.animated=false

sonar.gradle.skipCompile=true
Loading
Loading