Merge pull request #24 from AwesomeCICD/master

Update project to RN 0.63.1, new Xcode & Android executors

.babelrc

@@ -1,12 +1,12 @@
 {
   "presets": [
-    "babel-preset-react-native-stage-0/decorator-support"
+    "module:metro-react-native-babel-preset"
   ],
-  "env": {
-    "development": {
-      "plugins": [
-        "transform-react-jsx-source"
-      ]
-    }
-  }
+  // "env": {
+  //   "development": {
+  //     "plugins": [
+  //       "transform-react-jsx-source"
+  //     ]
+  //   }
+  // }
 }

.circleci/config.yml

@@ -1,9 +1,10 @@
-version: 2
+version: 2.1
 jobs:
   node:
     working_directory: ~/demo-react-native
     docker:
-      - image: circleci/node:8
+      - image: cimg/node:12.16
+
     steps:
       - checkout
 
@@ -44,63 +45,22 @@ jobs:
       - store_artifacts:
           path: test-results
 
-  android:
-    working_directory: ~/demo-react-native/android
-    docker:
-      - image: circleci/android:api-27-node8-alpha
-    steps:
-      - checkout:
-          path: ~/demo-react-native
-
-      - attach_workspace:
-          at: ~/demo-react-native
-
-      - restore_cache:
-          key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
-
-      - run: bundle install
-
-      - save_cache:
-          key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
-          paths:
-            - vendor/bundle
-
-      - run:
-          name: fastlane tests
-          command: |
-            mkdir -p test-results/fastlane
-            bundle exec fastlane test
-            mv fastlane/report.xml test-results/fastlane
-
-      - store_test_results:
-          path: test-results
-
-      - store_artifacts:
-          path: test-results
-
-  ios:
-    macos:
-      xcode: "9.0"
+  macos-build-and-test:
     working_directory: ~/demo-react-native
-
-    # use a --login shell so our "set Ruby version" command gets picked up for later steps
-    shell: /bin/bash --login -o pipefail
+    macos:
+      xcode: 11.3.0
+    environment:
+      FL_OUTPUT_DIR: output
+      FASTLANE_LANE: test
 
     steps:
       - checkout
-
-      - run:
-          name: set Ruby version
-          command:  echo "ruby-2.4" > ~/.ruby-version
-
       - restore_cache:
           key: yarn-v1-{{ checksum "yarn.lock" }}-{{ arch }}
 
       - restore_cache:
           key: node-v1-{{ checksum "package.json" }}-{{ arch }}
 
-      # not using a workspace here as Node and Yarn versions
-      # differ between our macOS executor image and the Docker containers above
       - run: yarn install
 
       - save_cache:
@@ -116,7 +76,16 @@ jobs:
       - restore_cache:
           key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}-{{ arch }}
 
-      - run:
+      #Pods directory is ignored to match default RN setup, but can also check them into source control
+      #https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+      - restore_cache:
+          key: pods-v1-{{ checksum "ios/Podfile.lock" }}-{{ arch }}
+
+      - run: 
+          command: pod install
+          working_directory: ios
+
+      - run: 
           command: bundle install
           working_directory: ios
 
@@ -125,33 +94,64 @@ jobs:
           paths:
             - vendor/bundle
 
+      - save_cache:
+          key: pods-v1-{{ checksum "ios/Podfile.lock" }}-{{ arch }}
+          paths:
+            - ios/Pods
+
       - run:
-          command: bundle exec fastlane test
+          name: Fastlane
+          command: bundle exec fastlane $FASTLANE_LANE
           working_directory: ios
 
+      - store_artifacts:
+          path: output
+
+      - store_test_results:
+          path: output/scan
+
+  android-build-and-test:
+    working_directory: ~/demo-react-native/android
+    docker:
+      - image: circleci/android:api-29-node
+    steps:
+      - checkout:
+          path: ~/demo-react-native
+
+      - attach_workspace:
+          at: ~/demo-react-native
+
+      - restore_cache:
+          key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
+
+      - run: bundle install
+
+      - save_cache:
+          key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
+          paths:
+            - vendor/bundle
+
       - run:
-          name: set up test results
-          working_directory: ios
-          when: always
+          name: fastlane tests
           command: |
-            mkdir -p test-results/fastlane test-results/xcode
+            mkdir -p test-results/fastlane
+            bundle exec fastlane test
             mv fastlane/report.xml test-results/fastlane
-            mv fastlane/test_output/report.junit test-results/xcode/junit.xml
 
       - store_test_results:
-          path: ios/test-results
+          path: test-results
 
       - store_artifacts:
-          path: ios/test-results
+          path: test-results
 
 workflows:
-  version: 2
   node-android-ios:
     jobs:
       - node
-      - android:
+      - android-build-and-test:
           requires:
             - node
-      - ios:
+      - macos-build-and-test:
           requires:
             - node
+

.gitignore

@@ -1,30 +1,59 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# expo
-.expo/
-
-# dependencies
-/node_modules
-
-# misc
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-ios/CircleCIDemoReactNative.xcodeproj/project.xcworkspace/xcuserdata/*
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-**/.DS_Store
-
-ios/build
-ios/fastlane/report.xml
-ios/fastlane/test_output
-
-**/junit.xml
-
-android/app/build
-android/build
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+
+# 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
+
+# Bundle artifact
+*.jsbundle
+
+# # CocoaPods
+/ios/Pods/