fix(android): use upstream autolink script (#303)

The issue that lead us to forking `native_modules.gradle` from `@react-native-community/cli-platform-android`, may have been fixed in [v4.4.0](https://github.com/react-native-community/cli/releases/tag/v4.4.0).
microsoft · Apr 7, 2021 · 4929c48 · 4929c48
1 parent 1b24a0d
commit 4929c48
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 303 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -53,7 +53,7 @@ apply plugin: "kotlin-kapt"
 def testAppDir = file("$projectDir/../../")
 
 apply from: file("${testAppDir}/test-app.gradle")
-applyTestAppModule(project, "com.microsoft.reacttestapp")
+applyTestAppModule(project)
 
 project.ext.react = [
     appName      : getAppName(),

diff --git a/android/test-app-native-modules.gradle b/android/test-app-native-modules.gradle
diff --git a/test-app.gradle b/test-app.gradle
@@ -35,15 +35,17 @@ private static void apply(Settings settings) {
 def scriptDir = buildscript.sourceFile.getParent()
 
 apply from: "$scriptDir/android/test-app-util.gradle"
-apply from: "$scriptDir/android/test-app-native-modules.gradle"
+
+def cliAndroidDir = findNodeModulesPath(rootDir, "@react-native-community/cli-platform-android")
+apply from: "$cliAndroidDir/native_modules.gradle"
 
 ext.applyTestAppSettings = { DefaultSettings defaultSettings ->
     apply(defaultSettings)
     applyNativeModulesSettingsGradle(defaultSettings)
 }
 
-ext.applyTestAppModule = { Project project, String packageName ->
-    applyNativeModulesAppBuildGradle(project, packageName)
+ext.applyTestAppModule = { Project project ->
+    applyNativeModulesAppBuildGradle(project)
 
     def isRntaProject = project.projectDir.getParent() != null &&
         (project.rootDir == file(project.projectDir.getParent()))