chore: merge example apps, update deps (#380)

* chore: merge example apps, update deps * fix: fix fabric-example leftover * Rename _ruby-version to .ruby-version * fix: properly setup ruby * fix: remove duplicate install * fix: example project name * Update android.yml * Update ios.yml * Update js.yml
th3rdwave · Apr 27, 2023 · 207d894 · 207d894
1 parent 4611840
commit 207d894
Show file tree

Hide file tree

Showing 116 changed files with 4,310 additions and 15,658 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -9,26 +9,24 @@ on:
       - 'android/**'
       - 'common/**'
       - 'example/android/**'
-      - 'fabric-example/android/**'
   pull_request:
     paths:
       - '.github/workflows/android.yml'
       - 'android/**'
       - 'example/android/**'
-      - 'fabric-example/android/**'
 
 jobs:
   android-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: Restore yarn workspaces
         id: yarn-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules
@@ -42,9 +40,27 @@ jobs:
       - name: Build android example app
         run: ./gradlew assembleDebug
         working-directory: example/android
-      - name: Install fabric example app dependencies
+  android-build-fabric:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18.x
+      - name: Restore yarn workspaces
+        id: yarn-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            */*/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+      - name: Install dependencies
         run: yarn install
-        working-directory: fabric-example
-      - name: Build android example app
-        run: ./gradlew assembleDebug
-        working-directory: fabric-example/android
+      - name: Install example app dependencies
+        run: yarn install
+        working-directory: example
+      - name: Build android example app with new arch enabled
+        run: ./gradlew assembleDebug -PnewArchEnabled=true
+        working-directory: example/android
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -9,48 +9,55 @@ on:
       - 'ios/**'
       - 'common/**'
       - 'example/ios/**'
-      - 'fabric-example/ios/**'
   pull_request:
     paths:
       - '.github/workflows/ios.yml'
       - 'ios/**'
       - 'example/ios/**'
-      - 'fabric-example/ios/**'
 jobs:
   ios-build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - uses: ruby/setup-ruby@v1
         with:
-          node-version: 16.x
+          working-directory: example
+          bundler-cache: true
       - name: Install dependencies
         run: yarn install
       - name: Install example app dependencies
         run: yarn install
         working-directory: example
-      - name: Install example app dependencies
-        run: yarn install
-        working-directory: example
-      - name: Install example app gems
-        run: bundle install
-        working-directory: example
       - name: Install pods
         run: bundle exec pod install
         working-directory: example/ios
       - name: Build ios example app
-        run: xcodebuild -scheme SafeAreaViewExample -workspace SafeAreaViewExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug
+        run: xcodebuild -scheme FabricExample -workspace FabricExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug
         working-directory: example/ios
-      - name: Install fabric example app dependencies
+  ios-build-fabric:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18.x
+      - uses: ruby/setup-ruby@v1
+        with:
+          working-directory: example
+          bundler-cache: true
+      - name: Install dependencies
         run: yarn install
-        working-directory: fabric-example
-      - name: Install fabric example app gems
-        run: bundle install
-        working-directory: fabric-example
-      - name: Install fabric pods
-        run: bundle exec pod install
-        working-directory: fabric-example/ios
-      - name: Build ios fabric example app
+      - name: Install example app dependencies
+        run: yarn install
+        working-directory: example
+      - name: Install pods for new arch
+        run: RCT_NEW_ARCH_ENABLED=1 bundle exec pod install
+        working-directory: example/ios
+      - name: Build ios example app
         run: xcodebuild -scheme FabricExample -workspace FabricExample.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug
-        working-directory: fabric-example/ios
+        working-directory: example/ios
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -24,14 +24,14 @@ jobs:
   js-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: Restore yarn workspaces
         id: yarn-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules

diff --git a/fabric-example/_bundle/config → example/.bundle/config b/fabric-example/_bundle/config → example/.bundle/config
diff --git a/example/.gitignore b/example/.gitignore
@@ -20,7 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
+ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -29,32 +29,35 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
 
-# CocoaPods
+# Ruby / CocoaPods
 /ios/Pods/
+/vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
diff --git a/fabric-example/_ruby-version → example/.ruby-version b/fabric-example/_ruby-version → example/.ruby-version
diff --git a/fabric-example/.watchmanconfig → example/.watchmanconfig b/fabric-example/.watchmanconfig → example/.watchmanconfig
diff --git a/example/Gemfile b/example/Gemfile
@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby File.read(File.join(__dir__, '.ruby-version')).strip
+
+gem 'cocoapods', '~> 1.11', '>= 1.11.3'
diff --git a/example/Gemfile.lock b/example/Gemfile.lock