Update Tuist; Moving dependencies from CocoaPods to Carthage

.tuist-version

@@ -1 +1 @@
-1.5.4
+1.8.0

Cartfile

@@ -4,3 +4,8 @@ github "RxSwiftCommunity/RxNimble" == 4.7.2
 github "RxSwiftCommunity/RxRealm" == 2.0.0
 github "RxSwiftCommunity/RxDataSources" == 4.0.1
 github "pointfreeco/swift-snapshot-testing" == 1.7.2
+github "onevcat/Kingfisher" == 5.14.0
+github "uias/Tabman" == 2.9.0
+github "SnapKit/SnapKit" == 5.0.1
+github "skywinder/ActionSheetPicker-3.0" == 2.5.0
+github "kif-framework/KIF" == 3.7.9

Cartfile.resolved

@@ -1,11 +1,17 @@
-github "Alamofire/Alamofire" "5.0.5"
+github "Alamofire/Alamofire" "5.2.0"
 github "Moya/Moya" "14.0.0"
-github "Quick/Nimble" "v8.0.7"
+github "Quick/Nimble" "v8.0.9"
 github "Quick/Quick" "v2.2.0"
 github "ReactiveCocoa/ReactiveSwift" "6.2.1"
 github "ReactiveX/RxSwift" "5.0.1"
 github "RxSwiftCommunity/RxDataSources" "4.0.1"
 github "RxSwiftCommunity/RxNimble" "4.7.2"
 github "RxSwiftCommunity/RxRealm" "2.0.0"
+github "SnapKit/SnapKit" "5.0.1"
+github "kif-framework/KIF" "v3.7.9"
+github "onevcat/Kingfisher" "5.14.0"
 github "pointfreeco/swift-snapshot-testing" "1.7.2"
-github "realm/realm-cocoa" "v4.4.0"
+github "realm/realm-cocoa" "v4.4.1"
+github "skywinder/ActionSheetPicker-3.0" "2.5.0"
+github "uias/Pageboy" "3.6.0"
+github "uias/Tabman" "2.9.0"

Podfile

@@ -2,15 +2,9 @@
 
 source 'https://github.com/CocoaPods/Specs.git'
 
-SNAPKIT_VERSION = '5.0.1'
-OSX_VERSION = '10.12'
 IOS_VERSION = '10.0'
 
 def ios_pods
-  pod 'Kingfisher', '5.12.0'
-  pod 'ActionSheetPicker-3.0', '2.3.0'
-  pod 'Tabman', '2.6.3'
-  pod 'SnapKit', SNAPKIT_VERSION
   pod 'Bugsnag'
 end
 
@@ -39,7 +33,7 @@ target 'CouchTracker' do
   use_frameworks!
   inhibit_all_warnings!
 
-  pod 'SwiftLint', '0.39.1'
+  pod 'SwiftLint', '0.39.2'
   ios_pods
 end
 
@@ -50,11 +44,3 @@ target 'CouchTrackerUITests' do
 
   ui_tests_pods
 end
-
-target 'CouchTrackerDebug' do
-  platform :ios, IOS_VERSION
-  use_frameworks!
-  inhibit_all_warnings!
-
-  pod 'SnapKit', SNAPKIT_VERSION
-end

Podfile.lock

@@ -1,52 +1,26 @@
 PODS:
-  - ActionSheetPicker-3.0 (2.3.0)
-  - AutoInsetter (1.8.0)
   - Bugsnag (5.23.0)
   - KIF (3.7.8):
     - KIF/Core (= 3.7.8)
   - KIF/Core (3.7.8)
-  - Kingfisher (5.12.0):
-    - Kingfisher/Core (= 5.12.0)
-  - Kingfisher/Core (5.12.0)
-  - Pageboy (3.5.0)
-  - SnapKit (5.0.1)
-  - SwiftLint (0.39.1)
-  - Tabman (2.6.3):
-    - AutoInsetter (~> 1.8.0)
-    - Pageboy (~> 3.5.0)
+  - SwiftLint (0.39.2)
 
 DEPENDENCIES:
-  - ActionSheetPicker-3.0 (= 2.3.0)
   - Bugsnag
   - KIF (= 3.7.8)
-  - Kingfisher (= 5.12.0)
-  - SnapKit (= 5.0.1)
-  - SwiftLint (= 0.39.1)
-  - Tabman (= 2.6.3)
+  - SwiftLint (= 0.39.2)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
-    - ActionSheetPicker-3.0
-    - AutoInsetter
     - Bugsnag
     - KIF
-    - Kingfisher
-    - Pageboy
-    - SnapKit
     - SwiftLint
-    - Tabman
 
 SPEC CHECKSUMS:
-  ActionSheetPicker-3.0: eef157d75e151f255c5333d26656c7fbfe905a51
-  AutoInsetter: 0b90ca74e36561c340129045a3722c51a0b15c58
   Bugsnag: 1f33ee5b55bc4b131a30e0fe6db714da9c6609f6
   KIF: 52e1af1a78cf6fe4ec6777b14776f3dd2eccc32e
-  Kingfisher: dc6e0f53bb5b12c3e75bedb0e01bbd7a640eea69
-  Pageboy: 3794c578aae5fcce06e90b3ed4a0ad6b807d75bb
-  SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
-  SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046
-  Tabman: 63eae331ae7a9388ae389b1808f1939269fcdece
+  SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
 
-PODFILE CHECKSUM: 75d6f0525d9c43eb417d5c7bd2ce9fb7e24a2c81
+PODFILE CHECKSUM: 6328459bf0c9c56366bddf8fcc8d985a79960345
 
 COCOAPODS: 1.9.1

Project.swift

@@ -12,6 +12,10 @@ extension Dictionary where Key == String, Value == String {
   func asConfig() -> Configuration {
     Configuration(settings: mapValues(SettingValue.init(stringLiteral:)))
   }
+
+  func asSettings() -> SettingsDictionary {
+    mapValues(SettingValue.init(stringLiteral:))
+  }
 }
 
 // MARK: - Common
@@ -20,14 +24,6 @@ private func carthageFramworkPath(named name: String) -> Path {
   Path("./Carthage/Build/iOS//\(name).framework")
 }
 
-private func carthageFramworkPathForBuildPhase(named name: String) -> Path {
-  Path("$(SRCROOT)/Carthage/Build/iOS//\(name).framework")
-}
-
-private func carthageOutputPath(named name: String) -> Path {
-  Path("$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)//\(name).framework")
-}
-
 private func actionSwiftLint() -> TargetAction {
   TargetAction.post(path: "build_phases/swiftlint", arguments: [], name: "SwiftLint")
 }
@@ -121,7 +117,7 @@ enum CouchTrackerApp {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -153,7 +149,7 @@ enum CouchTrackerAppTestable {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -186,7 +182,7 @@ enum CouchTrackerPersistence {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -218,7 +214,7 @@ enum CouchTrackerDebug {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -254,7 +250,7 @@ enum CouchTrackerCore {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -286,7 +282,7 @@ enum CouchTrackerCoreTests {
   }
 
   private static func settings() -> Settings {
-    Settings(base: iOSBaseSettings())
+    Settings(base: iOSBaseSettings().asSettings())
   }
 }
 
@@ -316,7 +312,7 @@ enum CouchTrackerSync {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -347,7 +343,7 @@ enum CouchTrackerSyncTests {
   }
 
   private static func settings() -> Settings {
-    Settings(base: iOSBaseSettings())
+    Settings(base: iOSBaseSettings().asSettings())
   }
 }
 
@@ -374,7 +370,7 @@ enum TraktSwift {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -406,7 +402,7 @@ enum TraktSwiftTests {
   }
 
   private static func settings() -> Settings {
-    Settings(base: iOSBaseSettings())
+    Settings(base: iOSBaseSettings().asSettings())
   }
 }
 
@@ -439,7 +435,7 @@ enum TraktSwiftTestable {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -469,7 +465,7 @@ enum TMDBSwift {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -498,7 +494,7 @@ enum TMDBSwiftTests {
   }
 
   private static func settings() -> Settings {
-    Settings(base: iOSBaseSettings())
+    Settings(base: iOSBaseSettings().asSettings())
   }
 }
 
@@ -529,7 +525,7 @@ enum TMDBSwiftTestable {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -562,7 +558,7 @@ enum TVDBSwift {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -590,7 +586,7 @@ enum TVDBSwiftTests {
   }
 
   private static func settings() -> Settings {
-    Settings(base: iOSBaseSettings())
+    Settings(base: iOSBaseSettings().asSettings())
   }
 }
 
@@ -616,7 +612,7 @@ enum TVDBSwiftTestable {
     let release = (releaseCodeSigning() + sharedBaseReleaseSettings()).asConfig()
 
     return Settings(
-      base: iOSBaseSettings(),
+      base: iOSBaseSettings().asSettings(),
       debug: debug,
       release: release
     )
@@ -644,11 +640,11 @@ enum CouchTrackerUITests {
 
   private static func settings() -> Settings {
     Settings(
-      base: [
+      base: ([
         "DEVELOPMENT_TEAM": "",
         "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/CouchTracker.app/CouchTracker",
         "BUNDLE_LOADER": "$(TEST_HOST)"
-      ] + iOSBaseSettings() + disableCodeSigning()
+      ] + iOSBaseSettings() + disableCodeSigning()).asSettings()
     )
   }
 }
@@ -669,7 +665,7 @@ func sharedBaseReleaseSettings() -> [String: String] {
 
 func iOSBaseSettings() -> [String: String] {
   [
-    "IPHONEOS_DEPLOYMENT_TARGET": miniOSVersion,
+    "IPHONEOS_DEPLOYMENT_TARGET":  miniOSVersion,
     "TARGETED_DEVICE_FAMILY": "1",
     "CODE_SIGN_STYLE": "Manual",
     "DEVELOPMENT_TEAM": "B5RPM7SE3L"