Merge pull request #234 from nimblehq/release/3.2.0

.github/workflows/publish_docs_to_wiki.yml

@@ -0,0 +1,41 @@
+name: Publish docs to Wiki
+
+on:
+  push:
+    paths:
+      - docs/**
+    branches:
+      - main
+
+env:
+  USER_TOKEN: ${{ secrets.NIMBLE_DEV_TOKEN }}
+  USER_NAME: team-nimblehq
+  USER_EMAIL: [email protected]
+  OWNER: ${{ github.event.repository.owner.name }}
+  REPOSITORY_NAME: ${{ github.event.repository.name }}
+
+jobs:
+  publish_docs_to_wiki:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Pull wiki
+        run: |
+          mkdir tmp_wiki
+          cd tmp_wiki
+          git init
+          git config user.name $USER_NAME
+          git config user.email $USER_EMAIL
+          git pull https://[email protected]/$OWNER/$REPOSITORY_NAME.wiki.git
+
+      - name: Push wiki
+        run: |
+          rsync -av --delete docs/ tmp_wiki/ --exclude .git
+          cd tmp_wiki
+          git add .
+          git commit -m "Update Wiki content"
+          git push -f --set-upstream https://[email protected]/$OWNER/$REPOSITORY_NAME.wiki.git master

.swift-version

@@ -0,0 +1 @@
+5.0

.swiftformat

@@ -9,3 +9,4 @@
 --disable wrapMultilineStatementBraces
 --disable wrapSwitchCases
 --disable blankLinesAtStartOfScope
+--stripunusedargs closure-only

.swiftlint.yml

@@ -5,7 +5,7 @@ included:
 
 excluded:
   - {PROJECT_NAME}Tests/Sources/Mocks/Sourcery/AutoMockable.generated.swift
-  - {PROJECT_NAME}/Sources/Supports/Helpers/R.swift/R.generated.swift
+  - {PROJECT_NAME}/Sources/Supports/Helpers/Rswift/R.generated.swift
   - Pods
   - Derived
   - DerivedData

Podfile

@@ -1,5 +1,6 @@
 platform :ios, '11.0'
 use_frameworks!
+inhibit_all_warnings!
 
 def testing_pods
   pod 'Quick'

Tuist/ProjectDescriptionHelpers/TargetAction+Initializing.swift

@@ -14,13 +14,12 @@ extension TargetAction {
     public static func rswiftAction() -> TargetAction {
         let rswiftPath = "$PODS_ROOT/R.swift/rswift"
         let inputPath = "$TEMP_DIR/rswift-lastrun"
-        let outputPath = "$SRCROOT/$PROJECT_NAME/Sources/Supports/Helpers/R.swift/R.generated.swift"
+        let outputPath = "$SRCROOT/$PROJECT_NAME/Sources/Supports/Helpers/Rswift/R.generated.swift"
         return .pre(
             script: "\"\(rswiftPath)\" generate \"\(outputPath)\"",
             name: "R.swift",
-            inputPaths: ["\(inputPath)"],
             outputPaths: ["\(outputPath)"],
-            basedOnDependencyAnalysis: true
+            basedOnDependencyAnalysis: false
         )
     }
 
@@ -78,7 +77,7 @@ extension TargetAction {
         ;;
         esac
         """
-        
+
         return .post(
             script: script,
             name: "Copy GoogleService-Info.plist",

docs/Home.md

@@ -0,0 +1,5 @@
+## Nimble iOS Templates
+
+This wiki contains documentation about our optimized iOS template.
+
+If you want to understand our templates, let's jump into [[Getting Started]].

docs/_Footer.md

@@ -0,0 +1 @@
+This project is maintained and funded by Nimble.

docs/_Sidebar.md

@@ -0,0 +1 @@
+* [[Home]]

fastlane/Fastfile

@@ -51,19 +51,6 @@ default_platform(:ios)
 platform :ios do
   # Testing
 
-  desc 'Build for testing'
-  lane :build_for_testing do
-    test_manager.build(scheme: Constants.TESTS_SCHEME)
-  end
-
-  desc 'Run tests'
-  lane :tests do
-    test_manager.test(
-      scheme: Constants.TESTS_SCHEME, 
-      targets: [Constants.TESTS_TARGET, Constants.UI_TESTS_TARGET]
-    )
-  end
-
   desc 'Run xcov'
   lane :run_xcov do
     clear_derived_data(derived_data_path: Constants.XCOV_OUTPUT_DIRECTORY_PATH)
@@ -76,8 +63,10 @@ platform :ios do
 
   desc 'Build and Test'
   lane :build_and_test do
-    build_for_testing
-    tests
+    test_manager.build_and_test(
+      scheme: Constants.TESTS_SCHEME, 
+      targets: [Constants.TESTS_TARGET, Constants.UI_TESTS_TARGET]
+    )
   end
 
   # Code Sign

fastlane/Managers/TestManager.rb

@@ -7,28 +7,13 @@ def initialize(fastlane:, device:, output_directory:)
     @output_directory = output_directory
   end
 
-  def build(scheme:)
+  def build_and_test(scheme:, targets:)
     @fastlane.scan(
       scheme: scheme,
       device: @device,
       output_directory: @output_directory,
       code_coverage: true,
       result_bundle: true,
-      build_for_testing: true,
-      should_zip_build_products: true,
-      clean: true,
-      fail_build: false
-    )
-  end
-
-  def test(scheme:, targets:)
-    @fastlane.scan(
-      scheme: scheme,
-      device: @device,
-      output_directory: @output_directory,
-      code_coverage: true,
-      result_bundle: true,
-      test_without_building: true, 
       only_testing: targets,
       fail_build: false
     )

make.sh

@@ -117,6 +117,10 @@ rename_folder "${CONSTANT_PROJECT_NAME}" "${PROJECT_NAME_NO_SPACES}"
 mkdir -p "${PROJECT_NAME_NO_SPACES}Tests/Sources/Mocks/Sourcery"
 touch "${PROJECT_NAME_NO_SPACES}Tests/Sources/Mocks/Sourcery/AutoMockable.generated.swift"
 
+# Add R.generated.swift file
+mkdir -p "${PROJECT_NAME_NO_SPACES}/Sources/Supports/Helpers/Rswift"
+touch "${PROJECT_NAME_NO_SPACES}/Sources/Supports/Helpers/Rswift/R.generated.swift"
+
 echo "✅  Completed"
 
 # Search and replace in files
@@ -163,4 +167,4 @@ rm -rf .github/workflows/test_install_script.yml
 echo "✅  Completed"
 
 # Done!
-echo "=> 🚀 Done! App is ready to be tested 🙌"
+echo "=> 🚀 Done! App is ready to be tested 🙌"

{PROJECT_NAME}/Sources/Constants/Constants+API.swift

@@ -1,5 +1,6 @@
+//  swiftlint:disable:this file_name
 //
 //  Constants+API.swift
 //
 
-extension Constants.API { }
+extension Constants.API {}

{PROJECT_NAME}/Sources/Constants/Constants.swift

@@ -4,5 +4,5 @@
 
 enum Constants {
 
-    enum API { }
+    enum API {}
 }

{PROJECT_NAME}/Sources/Data/NetworkAPI/Core/NetworkAPIProtocol.swift

@@ -2,9 +2,9 @@
 //  NetworkAPIProtocol.swift
 //
 
-import RxSwift
 import Alamofire
 import RxAlamofire
+import RxSwift
 
 protocol NetworkAPIProtocol {
 

{PROJECT_NAME}/Sources/Data/NetworkAPI/Core/RequestConfiguration.swift

@@ -2,8 +2,8 @@
 //  RequestConfiguration.swift
 //
 
-import Foundation
 import Alamofire
+import Foundation
 
 protocol RequestConfiguration {
 

{PROJECT_NAME}/Sources/Data/NetworkAPI/NetworkAPI.swift

@@ -2,8 +2,8 @@
 //  NetworkAPI.swift
 //
 
-import Foundation
 import Alamofire
+import Foundation
 import RxSwift
 
 final class NetworkAPI: NetworkAPIProtocol {

{PROJECT_NAME}/Sources/Domain/UseCases/UseCaseFactoryProtocol.swift

@@ -2,4 +2,4 @@
 //  UseCaseFactoryProtocol.swift
 //
 
-protocol UseCaseFactoryProtocol: AnyObject { }
+protocol UseCaseFactoryProtocol: AnyObject {}

{PROJECT_NAME}/Sources/Presentation/Navigator/Navigator+Scene.swift

@@ -8,5 +8,6 @@ extension Navigator {
 
     enum Scene {
         // Define scene
+        case home
     }
 }

{PROJECT_NAME}/Sources/Presentation/Navigator/Navigator.swift

@@ -16,16 +16,18 @@ protocol Navigatable: AnyObject {
 final class Navigator {
 
     private func viewController(from scene: Scene) -> UIViewController {
-        #warning("Create view controllers here")
-        return HomeViewController()
+        switch scene {
+        case .home:
+            return HomeViewController()
+        }
     }
 }
 
 extension Navigator: Navigatable {
 
     func show(scene: Scene, sender: UIViewController?, transition: Transition) {
         let target = viewController(from: scene)
-        if case .root(let window) = transition {
+        if case let .root(window) = transition {
             let snapshotOverlayView = UIScreen.main.snapshotView(afterScreenUpdates: false)
             target.view.addSubview(snapshotOverlayView)
             window?.rootViewController = target

{PROJECT_NAME}/Sources/Supports/Extensions/UIKit/Color+Application.swift

@@ -1,3 +1,4 @@
+//  swiftlint:disable:this file_name
 //
 //  UIColor+Application.swift
 //

{PROJECT_NAME}/Sources/Supports/Helpers/Typealiases/Typealiases.swift

@@ -1,3 +1,4 @@
+//  swiftlint:disable:this file_name
 //
 //  Typealiases.swift
 //