Merge pull request #1306 from flexn-io/fix/add_customization

Fix/add customization
flexn-io · Dec 20, 2023 · 85cd786 · 85cd786
2 parents 706bae7 + 713192a
commit 85cd786
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle b/packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = "testRNProject"
+rootProject.name = '{{RN_GRADLE_PROJECT_NAME}}'
 apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}')
diff --git a/packages/engine-rn-tvos/templates/platforms/firetv/settings.gradle b/packages/engine-rn-tvos/templates/platforms/firetv/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = "testRNProject"
+rootProject.name = '{{RN_GRADLE_PROJECT_NAME}}'
 apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}')
diff --git a/packages/engine-rn/templates/platforms/android/settings.gradle b/packages/engine-rn/templates/platforms/android/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = "testRNProject"
+rootProject.name = '{{RN_GRADLE_PROJECT_NAME}}'
 apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}')
diff --git a/packages/engine-rn/templates/platforms/androidwear/settings.gradle b/packages/engine-rn/templates/platforms/androidwear/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = "testRNProject"
+rootProject.name = '{{RN_GRADLE_PROJECT_NAME}}'
 apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}')
diff --git a/packages/sdk-android/src/deviceManager.ts b/packages/sdk-android/src/deviceManager.ts
@@ -55,7 +55,10 @@ export const launchAndroidSimulator = async (
     target: true | { name: string } | string,
     isIndependentThread = false
 ) => {
-    logTask('launchAndroidSimulator', `target:${target} independentThread:${!!isIndependentThread}`);
+    logTask(
+        'launchAndroidSimulator',
+        `target:${typeof target === 'object' ? target?.name : target} independentThread:${!!isIndependentThread}`
+    );
     let newTarget: { name: string } | string;
     if (target === true) {
         const {

diff --git a/packages/sdk-android/src/gradleParser.ts b/packages/sdk-android/src/gradleParser.ts
@@ -523,9 +523,9 @@ export const parseSettingsGradleSync = (c: Context) => {
     const rnCliLocation = doResolve('@react-native-community/cli-platform-android', true, { forceForwardPaths: true });
     const rnGradlePluginLocation = doResolve('@react-native/gradle-plugin', true, { forceForwardPaths: true });
 
-    const rnCliRelativePath = (!!rnCliLocation && path.relative(appFolder, rnCliLocation)) || '';
+    const rnCliRelativePath = (!!rnCliLocation && path.relative(appFolder, rnCliLocation).replace(/\\/g, '/')) || '';
     const rnGradlePluginRelativePath =
-        (!!rnGradlePluginLocation && path.relative(appFolder, rnGradlePluginLocation)) || '';
+        (!!rnGradlePluginLocation && path.relative(appFolder, rnGradlePluginLocation).replace(/\\/g, '/')) || '';
 
     const injects = [
         {
@@ -544,6 +544,10 @@ export const parseSettingsGradleSync = (c: Context) => {
             pattern: '{{RN_GRADLE_PLUGIN_LOCATION}}',
             override: rnGradlePluginRelativePath,
         },
+        {
+            pattern: '{{RN_GRADLE_PROJECT_NAME}}',
+            override: c.files.project.config?.projectName.replace('/', '-'),
+        },
     ];
 
     addSystemInjects(c, injects);