add react-native-photo-editor for ios + fix copying of builds folder …

…from external pluginTemplatess
flexn-io · Mar 14, 2024 · fbc09db · fbc09db
1 parent 15bd3c9
commit fbc09db
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 6 deletions.
diff --git a/packages/app-harness/renative.json b/packages/app-harness/renative.json
@@ -129,7 +129,26 @@
                 "package": "ui.photoeditor.RNPhotoEditorPackage"
             },
             "ios": {
-                "disabled": true
+                "podName": "iOSPhotoEditor",
+                "git": "https://github.com/prscX/photo-editor",
+                "commit": "4924e9ec984d25d03644e58aa148282642171de9",
+                "buildType": "dynamic",
+                "templateXcode": {
+                    "Podfile": {
+                        "header": ["plugin 'cocoapods-user-defined-build-types'", "enable_user_defined_build_types!"]
+                    },
+                    "project_pbxproj": {
+                        "resourceFiles": [
+                            "Resources/arrow1.png",
+                            "Resources/arrow2.png",
+                            "Resources/arrow3.png",
+                            "Resources/arrow4.png",
+                            "Resources/arrow5.png"
+                        ],
+                        "sourceFiles": ["RNPhotoEditor/RNPhotoEditor.m"],
+                        "headerFiles": ["RNPhotoEditor/RNPhotoEditor.h"]
+                    }
+                }
             },
             "tvos": {
                 "disabled": true

diff --git a/...ents/PhotoEditor/index.android.mobile.tsx → ...c/components/PhotoEditor/index.mobile.tsx b/...ents/PhotoEditor/index.android.mobile.tsx → ...c/components/PhotoEditor/index.mobile.tsx
diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts
@@ -905,12 +905,13 @@ export const copyTemplatePluginsSync = (c: RnvContext) => {
 
         // FOLDER MERGES FROM SCOPED PLUGIN TEMPLATES
         Object.keys(c.paths.rnv.pluginTemplates.dirs).forEach((pathKey) => {
-            if (pathKey !== 'rnv') {
-                const pluginTemplatePath = c.paths.rnv.pluginTemplates.dirs[pathKey];
+            // TODO: required for external rnv scoped templates to take effect. need to test full implications
+            // if (pathKey !== 'rnv') {
+            const pluginTemplatePath = c.paths.rnv.pluginTemplates.dirs[pathKey];
 
-                const sourcePath4sec = getAppConfigBuildsFolder(path.join(pluginTemplatePath, key));
-                copyFolderContentsRecursiveSync(sourcePath4sec, destPath, true, undefined, false, objectInject);
-            }
+            const sourcePath4sec = getAppConfigBuildsFolder(path.join(pluginTemplatePath, key));
+            copyFolderContentsRecursiveSync(sourcePath4sec, destPath, true, undefined, false, objectInject);
+            // }
         });
     });
 };

diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle b/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle
@@ -11,6 +11,17 @@ buildscript {
         ndkVersion = '{{NDK_VERSION}}'
         kotlinVersion = '{{INJECT_KOTLIN_VERSION}}'
     }
+    subprojects { subproject ->
+    afterEvaluate{
+        if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+            android {
+                compileSdkVersion rootProject.ext.compileSdkVersion
+                buildToolsVersion rootProject.ext.buildToolsVersion
+            }
+        }
+    }
+}
+
     repositories {
         google()
         mavenCentral()

diff --git a/packages/engine-rn-tvos/templates/platforms/firetv/build.gradle b/packages/engine-rn-tvos/templates/platforms/firetv/build.gradle
@@ -11,6 +11,17 @@ buildscript {
         ndkVersion = '{{NDK_VERSION}}'
         kotlinVersion = '{{INJECT_KOTLIN_VERSION}}'
     }
+    subprojects { subproject ->
+    afterEvaluate{
+        if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+            android {
+                compileSdkVersion rootProject.ext.compileSdkVersion
+                buildToolsVersion rootProject.ext.buildToolsVersion
+            }
+        }
+    }
+}
+
     repositories {
         google()
         mavenCentral()

diff --git a/packages/engine-rn/templates/platforms/androidwear/build.gradle b/packages/engine-rn/templates/platforms/androidwear/build.gradle
@@ -11,6 +11,17 @@ buildscript {
         ndkVersion = '{{NDK_VERSION}}'
         kotlinVersion = '{{INJECT_KOTLIN_VERSION}}'
     }
+
+    subprojects { subproject ->
+    afterEvaluate{
+        if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+            android {
+                compileSdkVersion rootProject.ext.compileSdkVersion
+                buildToolsVersion rootProject.ext.buildToolsVersion
+            }
+        }
+    }
+}
     repositories {
         google()
         mavenCentral()