Merge pull request #421 from nimblehq/release/4.0.0

Release - 4.0.0

.github/workflows/automatic_pull_request_review.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   review_pull_request:
     name: Pull request review by Danger
-    runs-on: macOS-latest
+    runs-on: macOS-12
     steps:
     - name: Cancel Previous Runs
       uses: styfle/[email protected]
@@ -42,12 +42,12 @@ jobs:
       run: bundle exec pod install
 
     - name: Build and Test
-      run: bundle exec fastlane build_and_test
+      run: bundle exec fastlane buildAndTest
       env:
         CI: true
 
     - name: Clean up previous code coverage report
-      run: bundle exec fastlane clean_up_xcov
+      run: bundle exec fastlane cleanUpOutput
 
     - name: Review pull request by Danger
       env:

.github/workflows/deploy_Firebase.yml

@@ -24,7 +24,7 @@ jobs:
       uses: norio-nomura/[email protected]
       with:
         args: --strict
-        
+
   build:
     name: Build
     runs-on: macOS-latest
@@ -48,7 +48,7 @@ jobs:
       run: |
         yarn global add firebase-tools
         echo "$(yarn global bin)" >> $GITHUB_PATH
-            
+
     - name: Bundle install
       # if: steps.bundleCache.outputs.cache-hit != 'true'
       run: bundle install
@@ -67,15 +67,15 @@ jobs:
       shell: bash
 
     - name: Build and Test
-      run: bundle exec fastlane build_and_test
+      run: bundle exec fastlane buildAndTest
 
     - name: Match Ad-hoc
-      run: bundle exec fastlane sync_adhoc_signing
+      run: bundle exec fastlane syncAdHocStagingCodeSigning
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASS }}
 
     - name: Build App and Distribute to Firebase
-      run: bundle exec fastlane build_and_upload_staging_app
+      run: bundle exec fastlane buildStagingAndUploadToFirebase
       env:
         FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
 

.github/workflows/deploy_Release_Firebase.yml

@@ -24,7 +24,7 @@ jobs:
       uses: norio-nomura/[email protected]
       with:
         args: --strict
-        
+
   build:
     name: Build
     runs-on: macOS-latest
@@ -43,7 +43,7 @@ jobs:
       uses: webfactory/[email protected]
       with:
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-            
+
     - name: Bundle install
       run: bundle install
 
@@ -61,15 +61,15 @@ jobs:
       shell: bash
 
     - name: Build and Test
-      run: bundle exec fastlane build_and_test
+      run: bundle exec fastlane buildAndTest
 
     - name: Match Ad-hoc
-      run: bundle exec fastlane sync_adhoc_production_signing
+      run: bundle exec fastlane syncAdHocProductionCodeSigning
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASS }}
 
     - name: Build Production App and Distribute to Firebase
-      run: bundle exec fastlane build_and_upload_production_app
+      run: bundle exec fastlane buildProductionAndUploadToFirebase
       env:
         FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
 

.github/workflows/deploy_AppStore.yml → .github/workflows/deploy_app_store.yml

@@ -24,7 +24,7 @@ jobs:
       uses: norio-nomura/[email protected]
       with:
         args: --strict
-        
+
   build:
     name: Build
     runs-on: macOS-latest
@@ -44,7 +44,7 @@ jobs:
       uses: webfactory/[email protected]
       with:
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-            
+
     - name: Bundle install
       run: bundle install
 
@@ -62,15 +62,15 @@ jobs:
       shell: bash
 
     - name: Build and Test
-      run: bundle exec fastlane build_and_test
+      run: bundle exec fastlane buildAndTest
 
     - name: Match AppStore
-      run: bundle exec fastlane sync_appstore_signing
+      run: bundle exec fastlane syncAppStoreCodeSigning
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASS }}
 
     - name: Build App and Distribute to AppStore
-      run: bundle exec fastlane build_and_upload_appstore_app
+      run: bundle exec fastlane buildAndUploadToAppStore
       env:
         APPSTORE_CONNECT_API_KEY: ${{ secrets.APPSTORE_CONNECT_API_KEY }}
 

.github/workflows/publish_docs_to_wiki.yml

@@ -16,4 +16,4 @@ jobs:
       USER_NAME: team-nimblehq
       USER_EMAIL: [email protected]
     secrets:
-      USER_TOKEN: ${{ secrets.NIMBLE_DEV_TOKEN }} 
+      USER_TOKEN: ${{ secrets.NIMBLE_DEV_TOKEN }}

.github/workflows/test_install_script.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   Test:
     name: Test
-    runs-on: macOS-latest
+    runs-on: macOS-12
     steps:
     - name: Cancel Previous Runs
       uses: styfle/[email protected]
@@ -25,6 +25,6 @@ jobs:
       run: sh make.sh --bundle-id co.nimblehq.template --bundle-id-staging co.nimblehq.template.staging --project-name TemplateApp
 
     - name: Build and Test
-      run: bundle exec fastlane build_and_test
+      run: bundle exec fastlane buildAndTest
       env:
         CI: true

.github/workflows/test_upload_build_to_test_flight.yml

@@ -11,7 +11,7 @@ name: Test Upload Build to TestFlight
 on:
   pull_request
 
-jobs:    
+jobs:
   build:
     name: Build
     runs-on: macOS-12
@@ -30,7 +30,7 @@ jobs:
       uses: webfactory/[email protected]
       with:
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-            
+
     - name: Bundle install
       run: bundle install
 
@@ -42,7 +42,7 @@ jobs:
         key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-pods-
-          
+
     - name: Start Install Script for Template App
       run: sh make.sh --bundle-id co.nimblehq.ios.templates --bundle-id-staging co.nimblehq.ios.templates.staging --project-name TemplateApp
 
@@ -54,16 +54,18 @@ jobs:
         ISSUER_ID: ${{ secrets.ISSUER_ID }}
 
     - name: Set Up Test Project for App Store
-      run: bundle exec fastlane set_up_test_project
+      run: bundle exec fastlane setUpTestProject
 
     - name: Update Provision Profile
-      run: bundle exec fastlane update_provision_settings
+      run: bundle exec fastlane updateProvisionSettings
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASS }}
-   
+
     - name: Build App and Distribute to AppStore
-      run: bundle exec fastlane build_and_upload_appstore_app
+      run: bundle exec fastlane buildAndUploadToAppStore
       env:
         APPSTORE_CONNECT_API_KEY: ${{ secrets.APPSTORE_CONNECT_API_KEY }}
+        API_KEY_ID: ${{ secrets.API_KEY_ID }}
+        ISSUER_ID: ${{ secrets.ISSUER_ID }}
         SKIP_FIREBASE_DSYM: "true"
         BUMP_APP_STORE_BUILD_NUMBER: "true"

.gitignore

@@ -64,12 +64,13 @@ fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
 fastlane/xcov_output
+fastlane/FastlaneRunner
 
 # Sourcery
 *.generated.swift
 
-# Derived Data folder
-DerivedData
+# Output folder (Derived Data, Build, ipa, etc)
+Output
 
 # Tuist
 .tuist-generated

Dangerfile

@@ -23,7 +23,10 @@ swiftlint.lint_files(
   additional_swiftlint_args: '--strict'
 )
 
-xcresultPath = "#{Constants.TEST_OUTPUT_DIRECTORY_PATH}/#{Constants.TESTS_SCHEME}.xcresult"
+xcresultPath = "./fastlane/test_output/{PROJECT_NAME} Staging.xcresult"
+scheme = "'{PROJECT_NAME} Staging'"
+workspace = "./{PROJECT_NAME}.xcworkspace"
+xcovOutputDirectory = "./fastlane/xcov_output"
 
 # Xcode summary
 changed_files = (git.modified_files - git.deleted_files) + git.added_files
@@ -40,9 +43,9 @@ xcode_summary.report xcresultPath
 
 # Xcov
 xcov.report(
-  scheme: Constants.TESTS_SCHEME,
-  workspace: Constants.WORKSPACE_PATH,
-  output_directory: Constants.XCOV_OUTPUT_DIRECTORY_PATH,
+  scheme: scheme,
+  workspace: workspace,
+  output_directory: xcovOutputDirectory,
   xccov_file_direct_path: xcresultPath,
   only_project_targets: true,
   markdown_report: true,

Podfile

@@ -53,7 +53,6 @@ post_install do |installer|
     target.build_configurations.each do |config|
       config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
       config.build_settings['ENABLE_BITCODE'] = 'NO'
-      # Fix some pods creating bundle, asking for signing
       if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
         target.build_configurations.each do |config|
             config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'

bitrise.yml

@@ -41,7 +41,7 @@ workflows:
     - fastlane@3:
         title: Build and upload Production app to App Store
         inputs:
-        - lane: build_and_upload_appstore_app
+        - lane: buildAndUploadToAppStoreLane
     - deploy-to-bitrise-io:
         inputs:
         - deploy_path: $BUILD_PATH
@@ -86,7 +86,7 @@ workflows:
     - fastlane@3:
         title: Build and Upload Production App
         inputs:
-        - lane: build_and_upload_production_app
+        - lane: buildProductionAndUploadToFirebaseLane
     - deploy-to-bitrise-io:
         inputs:
         - deploy_path: $BUILD_PATH
@@ -131,7 +131,7 @@ workflows:
     - fastlane@3:
         title: Build and Upload Staging App
         inputs:
-        - lane: build_and_upload_staging_app
+        - lane: buildStagingAndUploadToFirebaseLane
     - deploy-to-bitrise-io:
         inputs:
         - deploy_path: $BUILD_PATH
@@ -167,10 +167,10 @@ workflows:
     - cocoapods-install@2: {}
     - fastlane@3:
         inputs:
-        - lane: build_and_test
+        - lane: buildAndTestLane
     - fastlane@3:
         inputs:
-        - lane: clean_up_xcov
+        - lane: cleanUpOutputLane
     - danger@2:
         inputs:
         - github_api_token: "$DANGER_GITHUB_API_TOKEN"

fastlane/Appfile.swift

@@ -0,0 +1,7 @@
+var appIdentifier: String { return "[[APP_IDENTIFIER]]" } // The bundle identifier of your app
+var appleID: String { return "[[APPLE_ID]]" } // Your Apple Developer Portal username
+
+
+
+// For more information about the Appfile, see:
+//     https://docs.fastlane.tools/advanced/#appfile