Merge branch 'release/1.0' into add_tests

* release/1.0: (73 commits) fix styling on tizenwear use build folder only when bundling assets chore: disable apple e2e chore: enable android e2e chore: remove intel label from e2e add react-native-photo-editor for ios + fix copying of builds folder from external pluginTemplatess clean code remove unnecessary changes add react-native-photo-editor overrides fix fetchAndMovePhoto add PhotoEditor for android fix kaios sim run command update logger small fix regen schema, move rnvNewPatchDependencies to bootstrapConfig, add template spec for testing schemas add await alternative execute fix UTs, linter additional c cleanup more c cleanup ... # Conflicts: # packages/sdk-android/src/runner.ts
flexn-io · Mar 15, 2024 · 435b849 · 435b849
2 parents 4a74d03 + f9d335d
commit 435b849
Show file tree

Hide file tree

Showing 242 changed files with 4,058 additions and 3,254 deletions.
diff --git a/.github/workflows/e2e-harness-android.yml b/.github/workflows/e2e-harness-android.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-harness-android:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-android' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/e2e-harness-androidtv.yml b/.github/workflows/e2e-harness-androidtv.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-harness-androidtv:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-androidtv' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/e2e-template-android.yml b/.github/workflows/e2e-template-android.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-template-android:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-android' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/e2e-template-androidtv.yml b/.github/workflows/e2e-template-androidtv.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-template-androidtv:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-androidtv' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/rnvUnitTest.yml b/.github/workflows/rnvUnitTest.yml
@@ -20,6 +20,7 @@ jobs:
               run: |
                   yarn
                   yarn bootstrap
+                  yarn lint
                   yarn test
               env:
                   CI: true

diff --git a/packages/app-harness/appConfigs/base/renative.json b/packages/app-harness/appConfigs/base/renative.json
@@ -31,8 +31,7 @@
             "{{resolvePackage(react-native-vector-icons)}}/Fonts"
         ],
         "excludedPlugins": [
-            "@react-native-firebase/app",
-            "react-native-photo-editor"
+            "@react-native-firebase/app"
         ]
     },
     "platforms": {

diff --git a/packages/app-harness/buildHooks/tsconfig.json b/packages/app-harness/buildHooks/tsconfig.json
diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json
@@ -53,10 +53,12 @@
         "react-native-gesture-handler": "2.14.1",
         "react-native-orientation-locker": "1.5.0",
         "react-native-permissions": "4.1.4",
-        "react-native-photo-editor": "1.0.13",
+        "react-native-photo-editor": "github:AppGyver/react-native-photo-editor#v0.1.2",
         "react-native-splash-screen": "3.3.0",
         "react-native-tvos": "0.73.1-3",
-        "react-native-web": "0.19.9"
+        "react-native-web": "0.19.9",
+        "react-native-fs": "2.20.0",
+        "rn-fetch-blob": "0.12.0"
     },
     "devDependencies": {
         "@flexn/assets-renative-outline": "0.3.3",

diff --git a/packages/app-harness/renative.json b/packages/app-harness/renative.json
@@ -12,7 +12,7 @@
         "react-native-splash-screen": {
             "android": {
                 "templateAndroid": {
-                    "MainActivity_java": {
+                    "MainActivity_kt": {
                         "createMethods": ["SplashScreen.show(this)"],
                         "imports": ["org.devio.rn.splashscreen.SplashScreen"]
                     }
@@ -40,13 +40,14 @@
         "TestNativeModule": {
             "android": {
                 "templateAndroid": {
-                    "MainApplication_java": {
+                    "MainApplication_kt": {
                         "packages": ["MyAppPackage"]
                     }
                 },
                 "forceLinking": true
             }
         },
+        "rn-fetch-blob": { "tvos": { "disabled": true }, "version": "0.12.0" },
         "react-native-carplay": {
             "ios": {
                 "templateXcode": {
@@ -100,6 +101,11 @@
                         "tag": "manifest",
                         "android:name": "",
                         "children": [
+                            {
+                                "tag": "uses-permission ",
+                                "android:name": "android.permission.WRITE_EXTERNAL_STORAGE",
+                                "children": []
+                            },
                             {
                                 "tag": "application",
                                 "android:name": ".MainApplication",
@@ -126,10 +132,29 @@
                 "podName": "iOSPhotoEditor",
                 "git": "https://github.com/prscX/photo-editor",
                 "commit": "4924e9ec984d25d03644e58aa148282642171de9",
-                "buildType": "dynamic"
+                "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
             },
             "pluginDependencies": null,
-            "version": "1.0.13"
+            "version": "github:AppGyver/react-native-photo-editor#v0.1.2"
         },
         "react-native-permissions": {
             "ios": {
@@ -208,6 +233,12 @@
             },
             "NSContactsUsageDescription": {
                 "desc": "Contacts usage description"
+            },
+            "NSPhotoLibraryAddUsageDescription": {
+                "desc": "Application needs permission to write photos..."
+            },
+            "NSPhotoLibraryUsageDescription": {
+                "desc": "iOS 10 needs permission to write photos..."
             }
         }
     }