Skip to content

Commit

Permalink
* Removes BuildSystem from SourceExplorer
Browse files Browse the repository at this point in the history
  • Loading branch information
njlr committed Oct 7, 2019
1 parent 13909a3 commit 6ee3037
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
13 changes: 2 additions & 11 deletions buckaroo/DefaultSourceExplorer.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open Buckaroo.Console
open Buckaroo.RichOutput
open Buckaroo.Logger

type DefaultSourceExplorer (console : ConsoleManager, downloadManager : DownloadManager, gitManager : GitManager, buildSystem : BuildSystem) =
type DefaultSourceExplorer (console : ConsoleManager, downloadManager : DownloadManager, gitManager : GitManager) =
let logger = createLogger console (Some "explorer")
let toOptional = Async.Catch >> (Async.map Choice.toOption)

Expand Down Expand Up @@ -308,16 +308,7 @@ type DefaultSourceExplorer (console : ConsoleManager, downloadManager : Download
(Manifest.ManifestParseError.show error)
raise <| System.Exception errorMessage
| None ->
// This might be a Bazel project
if buildSystem = Bazel
then
do!
fetchFile location "WORKSPACE"
|> Async.Ignore

return Manifest.zero
else
return raise <| System.Exception ("No manifest was found at " + (PackageLock.show location) + ". ")
return raise <| System.Exception ("No manifest was found at " + (PackageLock.show location) + ". ")
}

member this.FetchLock (location, versions) =
Expand Down
2 changes: 1 addition & 1 deletion buckaroo/Tasks.fs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ let getContext loggingLevel fetchStyle = async {

let! buildSystem = determineBuildSystem (createLogger consoleManager None)

let sourceExplorer = DefaultSourceExplorer(consoleManager, downloadManager, gitManager, buildSystem)
let sourceExplorer = DefaultSourceExplorer(consoleManager, downloadManager, gitManager)

return {
Console = consoleManager
Expand Down

0 comments on commit 6ee3037

Please sign in to comment.