Skip to content
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

Jump to bottom

feat: improve native_module.gradle for certain custom project setups #2341

Closed
wants to merge 5 commits into from
Closed

feat: improve native_module.gradle for certain custom project setups #2341

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b78ed48
feat: improve native_module.gradle usage
AlexanderEggers Mar 21, 2024
b5ee6c8
feat: simplify applyNativeModulesAppBuildGradle to avoid needing anot…
AlexanderEggers Mar 21, 2024
0b13d21
fix: add missing providers arg
AlexanderEggers Mar 21, 2024
789e3b9
chore: tweaking code
AlexanderEggers Mar 21, 2024
8e9c277
chore: simplifying code
AlexanderEggers Mar 21, 2024
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
16 changes: 6 additions & 10 deletions packages/cli-platform-android/native_modules.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,6 @@ class ReactNativeModules {
}
}


/*
* Sometimes Gradle can be called outside of JavaScript hierarchy. Detect the directory
* where build files of an active project are located.
*/
def projectRoot = rootProject.projectDir

def autoModules = new ReactNativeModules(logger, providers, projectRoot)

def reactNativeVersionRequireNewArchEnabled(autoModules) {
def rnVersion = autoModules.reactNativeVersion
def regexPattern = /^(\d+)\.(\d+)\.(\d+)(?:-(\w+(?:[-.]\d+)?))?$/
Expand All @@ -524,11 +515,16 @@ def reactNativeVersionRequireNewArchEnabled(autoModules) {
* Exported Extensions
* ------------------------ */

ext.applyNativeModulesSettingsGradle = { DefaultSettings defaultSettings ->
ext.applyNativeModulesSettingsGradle = { DefaultSettings defaultSettings, File reactRoot = null ->
def projectRoot = reactRoot != null ? reactRoot : rootProject.projectDir
def autoModules = new ReactNativeModules(logger, providers, projectRoot)
autoModules.addReactNativeModuleProjects(defaultSettings)
}

ext.applyNativeModulesAppBuildGradle = { Project project ->
def reactExtension = rootProject.extensions.getByName("privateReact")
def projectRoot = reactExtension.root.getAsFile().getOrNull() ?: rootProject.projectDir
def autoModules = new ReactNativeModules(logger, providers, projectRoot)
autoModules.addReactNativeModuleDependencies(project)

def generatedSrcDir = new File(buildDir, "generated/rncli/src/main/java")
Expand Down
Loading