Merge pull request #511 from nimblehq/release/4.7.0

Release - 4.7.0

Author: blyscuit

.github/wiki/Deliverable-Configurations.md

@@ -12,5 +12,4 @@ The file [DeliverableConstants.rb](https://github.com/nimblehq/ios-templates/blo
 ## Configure later
 
 - Developer can modify the `DeliverableConstants` at any time.
-- Use the command `sh deliverable_setup.sh` to open `DeliverableConstants` with Xcode.
 - Open the file manually at `fastlane/Constants/DeliverableConstants.rb` with any IDE.

.github/wiki/Selecting-User-Interface.md

@@ -0,0 +1,11 @@
+## Selecting User Interface
+
+Current the template supports setup with two user interfaces:
+- UIKit
+- SwiftUI
+
+To select a user interface when creating a project pass the argument `--interface [SwiftUI or UIKit]` with the `make` script. 
+
+    ```bash
+    sh make.sh --bundle-id [BUNDLE_ID_PRODUCTION] --bundle-id-staging [BUNDLE_ID_STAGING] --project-name [PROJECT_NAME] --interface SwiftUI
+    ```

.github/wiki/_Sidebar.md

@@ -3,6 +3,7 @@
 - [[Home]]
 - [[Getting Started]]
 - [[Deliverable Configurations]]
+- [[Selecting User Interface]]
 
 ## Architecture
 

.github/workflows/test_swiftui_install_script.yml

@@ -0,0 +1,27 @@
+name: Test SwiftUI Install Script
+
+on:
+  push:
+    branches: [ feature/**, bug/**, chore/** ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  Test:
+    name: Test
+    runs-on: macOS-12
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Bundle install
+      run: bundle install
+
+    - name: Start Install Script for SwiftUI Template App
+      run: sh make.sh --bundle-id co.nimblehq.template --bundle-id-staging co.nimblehq.template.staging --project-name TemplateApp --interface SwiftUI
+
+    - name: Build and Test
+      run: bundle exec fastlane buildAndTest
+      env:
+        CI: true

.github/workflows/test_install_script.yml renamed to .github/workflows/test_uikit_install_script.yml

@@ -1,4 +1,4 @@
-name: Test Install Script
+name: Test UIKit Install Script
 
 on:
   push:
@@ -14,14 +14,12 @@ jobs:
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
 
     - name: Bundle install
       run: bundle install
 
-    - name: Start Install Script for Template App
-      run: sh make.sh --bundle-id co.nimblehq.template --bundle-id-staging co.nimblehq.template.staging --project-name TemplateApp
+    - name: Start Install Script for UIKit Template App
+      run: sh make.sh --bundle-id co.nimblehq.template --bundle-id-staging co.nimblehq.template.staging --project-name TemplateApp --interface UIKit
 
     - name: Build and Test
       run: bundle exec fastlane buildAndTest

.github/workflows/test_upload_build_to_firebase.yml

@@ -47,10 +47,10 @@ jobs:
           ${{ 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
+      run: sh make.sh --bundle-id co.nimblehq.ios.templates --bundle-id-staging co.nimblehq.ios.templates.staging --project-name TemplateApp --interface UIKit
 
     - name: Start Setup Script for Template App Firebase Upload
-      run: sh set_up_test_firebase.sh
+      run: cat Scripts/Swift/SetUpTestFirebase.swift Scripts/Swift/Extensions/FileManager+Utils.swift | swift -
       env:
         MATCH_REPO: ${{ secrets.MATCH_REPO }}
         STAGING_FIREBASE_APP_ID: ${{ secrets.STAGING_FIREBASE_APP_ID }}

.github/workflows/test_upload_build_to_test_flight.yml

@@ -44,7 +44,7 @@ jobs:
           ${{ 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
+      run: sh make.sh --bundle-id co.nimblehq.ios.templates --bundle-id-staging co.nimblehq.ios.templates.staging --project-name TemplateApp --interface UIKit
 
     - name: Start Setup Script for Template App TestFlight Upload
       run: sh set_up_test_testflight.sh

Dangerfile

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require './fastlane/Constants/Constants'
-
 # Warn when there is a big PR
 warn("This pull request is quite big (#{git.lines_of_code} lines changed), please consider splitting it into multiple pull requests.") if git.lines_of_code > 500
 

Scripts/Swift/Extensions/FileManager+Utils.swift

@@ -0,0 +1,76 @@
+import Foundation
+
+extension FileManager {
+
+    func moveFiles(in directory: String, to destination: String) {
+        let currentDirectory = currentDirectoryPath
+        let files = try? contentsOfDirectory(
+            atPath: "\(currentDirectory)/\(directory)"
+        )
+        if let files = files {
+            for file in files {
+                guard file != ".DS_Store" else { continue }
+                do {
+                    try moveItem(
+                        atPath: "\(currentDirectory)/\(directory)/\(file)",
+                        toPath:"\(currentDirectory)/\(destination)/\(file)"
+                    )
+                } catch {
+                    print("Error \(error)")
+                }
+            }
+        }
+    }
+
+    func rename(file: String, to destination: String) {
+        let currentDirectory = currentDirectoryPath
+        do {
+            try moveItem(
+                atPath: "\(currentDirectory)/\(file)",
+                toPath:"\(currentDirectory)/\(destination)"
+            )
+        } catch {
+            print("Error \(error)")
+        }
+    }
+
+    func removeItems(in directory: String) {
+        let currentDirectory = currentDirectoryPath
+        do {
+            try removeItem(atPath: "\(currentDirectory)/\(directory)")
+        } catch {
+            print("Error \(error)")
+        }
+    }
+
+    func replaceAllOccurrences(of original: String, to replacing: String) {
+        let files = try? allFiles(in: currentDirectoryPath)
+        guard let files else { return print("Cannot find any files in current directory") }
+        for file in files {
+            do {
+                let text = try String(contentsOf: file, encoding: .utf8)
+                let modifiedText = text.replacingOccurrences(of: original, with: replacing)
+                try modifiedText.write(to: file, atomically: true, encoding: .utf8)
+            } catch {
+                print(error.localizedDescription)
+            }
+        }
+    }
+
+    private func allFiles(in directory: String) throws -> [URL] {
+        let url = URL(fileURLWithPath: directory)
+        var files = [URL]()
+        if let enumerator = enumerator(
+            at: url, 
+            includingPropertiesForKeys: [.isRegularFileKey], 
+            options: [.skipsHiddenFiles, .skipsPackageDescendants]
+        ) {
+            for case let fileURL as URL in enumerator {
+                let fileAttributes = try? fileURL.resourceValues(forKeys:[.isRegularFileKey])
+                guard fileAttributes?.isRegularFile ?? false else { continue }
+                files.append(fileURL)
+            }
+        }
+        return files
+    }
+}

Scripts/Swift/Helpers/SafeShell.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+@discardableResult
+func safeShell(_ command: String) throws -> String? {
+    let task = Process()
+    let pipe = Pipe()
+    
+    task.standardOutput = pipe
+    task.standardError = pipe
+    task.arguments = ["-c", command]
+    task.executableURL = URL(fileURLWithPath: "/bin/zsh")
+    task.standardInput = nil
+
+    try task.run()
+    
+    let data = pipe.fileHandleForReading.readDataToEndOfFile()
+    let output = String(data: data, encoding: .utf8)
+    
+    return output
+}