fixing crash when hitting more/reset (#139)

frameworklabs · antranapp · commit 78aee69b5bb6 · 2019-12-04T13:26:40.000+01:00
* adding .DS_Store and Carthage to .gitignore

* fixing crash when resetting.

* Only ignoring Carthage/Build instead of Carthage
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+.DS_Store
+
 ## Build generated
 DerivedData/
 
@@ -53,6 +55,7 @@ playground.xcworkspace
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
+Carthage/Build/
 Carthage/Checkouts
 
 # fastlane
diff --git a/SwiftCommunity/SwiftCommunity/Sources/Application/Scenes/Dashboard/DashboardComponent.swift b/SwiftCommunity/SwiftCommunity/Sources/Application/Scenes/Dashboard/DashboardComponent.swift
@@ -35,6 +35,6 @@ extension DashboardComponent: HasAuthorsService {
 extension DashboardComponent: HasConferencesGitService {
 
     var conferencesGitService: ConferencesGitServiceProtocol {
-        return dependencyProvider.context.engine.serviceRegistry.resolve(type: ConferencesGitService.self)
+        return dependencyProvider.context.engine.serviceRegistry.resolve(type: ConferencesGitServiceProtocol.self)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`#`
`3`	`3`	`# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore`
`4`	`4`
	`5`	`+.DS_Store`
	`6`	`+`
`5`	`7`	`## Build generated`
`6`	`8`	`DerivedData/`
`7`	`9`
`@@ -53,6 +55,7 @@ playground.xcworkspace`
`53`	`55`	`# Carthage`
`54`	`56`	`#`
`55`	`57`	`# Add this line if you want to avoid checking in source code from Carthage dependencies.`
	`58`	`+Carthage/Build/`
`56`	`59`	`Carthage/Checkouts`
`57`	`60`
`58`	`61`	`# fastlane`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ extension DashboardComponent: HasAuthorsService {`
`35`	`35`	`extension DashboardComponent: HasConferencesGitService {`
`36`	`36`
`37`	`37`	`var conferencesGitService: ConferencesGitServiceProtocol {`
`38`		`- return dependencyProvider.context.engine.serviceRegistry.resolve(type: ConferencesGitService.self)`
	`38`	`+ return dependencyProvider.context.engine.serviceRegistry.resolve(type: ConferencesGitServiceProtocol.self)`
`39`	`39`	`}`
`40`	`40`	`}`