Merge pull request #1813 from flexn-io/fix/android_app/build.gradle_o…

…verrides bring back the injection {{PLUGIN_APPLY}} to app/build.gradle
flexn-io · Dec 3, 2024 · 8d0c0a6 · 8d0c0a6
2 parents d0e14db + e41a0de
commit 8d0c0a6
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 58 deletions.
diff --git a/packages/core/jsonSchema/renative-1.0.schema.json b/packages/core/jsonSchema/renative-1.0.schema.json
@@ -710,7 +710,6 @@
                                                             }
                                                         }
                                                     },
-                                                    "required": ["repositories", "dependencies", "ext", "custom"],
                                                     "additionalProperties": false
                                                 },
                                                 "injectAfterAll": {

diff --git a/packages/core/jsonSchema/rnv.app.json b/packages/core/jsonSchema/rnv.app.json
@@ -537,12 +537,6 @@
                                                                         }
                                                                     }
                                                                 },
-                                                                "required": [
-                                                                    "repositories",
-                                                                    "dependencies",
-                                                                    "ext",
-                                                                    "custom"
-                                                                ],
                                                                 "additionalProperties": false
                                                             },
                                                             "injectAfterAll": {

diff --git a/packages/core/jsonSchema/rnv.plugin.json b/packages/core/jsonSchema/rnv.plugin.json
@@ -237,7 +237,6 @@
                                                             }
                                                         }
                                                     },
-                                                    "required": ["repositories", "dependencies", "ext", "custom"],
                                                     "additionalProperties": false
                                                 },
                                                 "injectAfterAll": {

diff --git a/packages/core/jsonSchema/rnv.project.json b/packages/core/jsonSchema/rnv.project.json
@@ -860,12 +860,6 @@
                                                                         }
                                                                     }
                                                                 },
-                                                                "required": [
-                                                                    "repositories",
-                                                                    "dependencies",
-                                                                    "ext",
-                                                                    "custom"
-                                                                ],
                                                                 "additionalProperties": false
                                                             },
                                                             "injectAfterAll": {

diff --git a/packages/core/jsonSchema/rnv.templates.json b/packages/core/jsonSchema/rnv.templates.json
@@ -331,12 +331,6 @@
                                                                                         }
                                                                                     }
                                                                                 },
-                                                                                "required": [
-                                                                                    "repositories",
-                                                                                    "dependencies",
-                                                                                    "ext",
-                                                                                    "custom"
-                                                                                ],
                                                                                 "additionalProperties": false
                                                                             },
                                                                             "injectAfterAll": {

diff --git a/packages/core/src/schema/platforms/fragments/templateAndroid.ts b/packages/core/src/schema/platforms/fragments/templateAndroid.ts
@@ -127,12 +127,14 @@ const templateAndroid = z
         build_gradle: z
             .object({
                 plugins: z.array(z.string()),
-                buildscript: z.object({
-                    repositories: z.array(z.string()),
-                    dependencies: z.array(z.string()),
-                    ext: z.array(z.string()),
-                    custom: z.array(z.string()),
-                }),
+                buildscript: z
+                    .object({
+                        repositories: z.array(z.string()),
+                        dependencies: z.array(z.string()),
+                        ext: z.array(z.string()),
+                        custom: z.array(z.string()),
+                    })
+                    .partial(),
                 injectAfterAll: z.array(z.string()),
             })
             .partial()

diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/app/build.gradle b/packages/engine-rn-tvos/templates/platforms/androidtv/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+{{PLUGIN_APPLY}}
 
 {{PLUGIN_LOCAL_PROPERTIES}}
 

diff --git a/packages/engine-rn-tvos/templates/platforms/firetv/app/build.gradle b/packages/engine-rn-tvos/templates/platforms/firetv/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+{{PLUGIN_APPLY}}
 
 {{PLUGIN_LOCAL_PROPERTIES}}
 

diff --git a/packages/engine-rn/templates/platforms/android/app/build.gradle b/packages/engine-rn/templates/platforms/android/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
-
+{{PLUGIN_APPLY}}
 
 {{PLUGIN_LOCAL_PROPERTIES}}
 

diff --git a/packages/engine-rn/templates/platforms/androidwear/app/build.gradle b/packages/engine-rn/templates/platforms/androidwear/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+{{PLUGIN_APPLY}}
 
 {{PLUGIN_LOCAL_PROPERTIES}}
 

diff --git a/packages/sdk-android/src/gradleParser.ts b/packages/sdk-android/src/gradleParser.ts
@@ -21,14 +21,14 @@ import {
 import path from 'path';
 import { getBuildFilePath, getAppId, getAppVersion, getAppVersionCode, addSystemInjects } from '@rnv/sdk-utils';
 import { Context, getContext } from './getContext';
+import { TemplateAndroid } from './types';
 
 const currentOs = process.platform === 'darwin' ? 'osx' : process.platform === 'win32' ? 'win64' : 'linux64';
 
 export const parseBuildGradleSync = () => {
     const c = getContext();
     const appFolder = getAppFolder();
 
-
     const templateAndroid = getConfigProp('templateAndroid');
     const buildscript = templateAndroid?.build_gradle?.buildscript;
 
@@ -325,6 +325,9 @@ ${chalk().bold.white(c.paths.workspace?.appConfig?.configsPrivate?.join('\n'))}`
         ${releaseBuildTypes.join('\n        ')}
     }`;
 
+    // APP/BUILD.GRADLE
+    _parseAppBuildGradleObject(appBuildGradle);
+
     // MULTI APK
     // const versionCodeOffset = getConfigProp('versionCodeOffset', 0);
     const isMultiApk = getConfigProp('multipleAPKs') === true;
@@ -666,36 +669,7 @@ export const parseAndroidConfigObject = (plugin?: ConfigPluginPlatformSchema, ke
     const templateAndroid = plugin?.templateAndroid;
 
     const appBuildGradle = templateAndroid?.app_build_gradle;
-    if (appBuildGradle) {
-        if (appBuildGradle.apply) {
-            appBuildGradle.apply.forEach((v) => {
-                c.payload.pluginConfigAndroid.applyPlugin += `apply ${sanitizePluginPath(v, key)}\n`;
-            });
-        }
-
-        if (appBuildGradle.defaultConfig) {
-            appBuildGradle.defaultConfig.forEach((v) => {
-                c.payload.pluginConfigAndroid.defaultConfig += `${sanitizePluginPath(v, key)}\n`;
-            });
-        }
-
-        const { implementations } = appBuildGradle;
-        if (implementations) {
-            implementations.forEach((v) => {
-                c.payload.pluginConfigAndroid.appBuildGradleImplementations += `    implementation ${sanitizePluginPath(
-                    v,
-                    key
-                )}\n`;
-            });
-        }
-
-        const afterEvaluate = appBuildGradle?.afterEvaluate;
-        if (afterEvaluate) {
-            afterEvaluate.forEach((v) => {
-                c.payload.pluginConfigAndroid.appBuildGradleAfterEvaluate += ` ${sanitizePluginPath(v, key)}\n`;
-            });
-        }
-    }
+    _parseAppBuildGradleObject(appBuildGradle, key);
 
     // BUILD.GRADLE
     const buildGradle = templateAndroid?.build_gradle;
@@ -740,6 +714,41 @@ const _fixAndroidLegacy = (c: RnvContext, modulePath: string) => {
     }
 };
 
+const _parseAppBuildGradleObject = (appBuildGradle: TemplateAndroid['app_build_gradle'] | undefined, key = '') => {
+    const c = getContext();
+    if (appBuildGradle) {
+        if (appBuildGradle.apply) {
+            appBuildGradle.apply.forEach((v) => {
+                c.payload.pluginConfigAndroid.applyPlugin += v.includes('apply')
+                    ? `${sanitizePluginPath(v, key)}\n`
+                    : `apply ${sanitizePluginPath(v, key)}\n`;
+            });
+        }
+
+        if (appBuildGradle.defaultConfig) {
+            appBuildGradle.defaultConfig.forEach((v) => {
+                c.payload.pluginConfigAndroid.defaultConfig += `${sanitizePluginPath(v, key)}\n`;
+            });
+        }
+
+        const { implementations } = appBuildGradle;
+        if (implementations) {
+            implementations.forEach((v) => {
+                c.payload.pluginConfigAndroid.appBuildGradleImplementations += `    implementation ${sanitizePluginPath(
+                    v,
+                    key
+                )}\n`;
+            });
+        }
+
+        const afterEvaluate = appBuildGradle?.afterEvaluate;
+        if (afterEvaluate) {
+            afterEvaluate.forEach((v) => {
+                c.payload.pluginConfigAndroid.appBuildGradleAfterEvaluate += ` ${sanitizePluginPath(v, key)}\n`;
+            });
+        }
+    }
+};
 // const _getPrivateConfig = (c, platform) => {
 //     let privateConfigFolder = path.join(c.paths.workspace.dir, c.files.project.package.name, c.buildConfig.id);
 //     if (!fsExistsSync(privateConfigFolder)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -710,7 +710,6 @@ @@
                                                                 }
                                                             }
                                                         },
-                                                        "required": ["repositories", "dependencies", "ext", "custom"],
                                                         "additionalProperties": false
                                                     },
                                                     "injectAfterAll": {
@@ Expand Down @@