Merge branch 'master' into docker-hub

* master:
  Always write the GHC environment files.
  I was working on the wrong branch, smh
  Use source-repository-package to pin Git deps in cabal.

Author: dcreager

.gitmodules

@@ -1,12 +1,3 @@
-[submodule "vendor/hspec-expectations-pretty-diff"]
-	path = vendor/hspec-expectations-pretty-diff
-	url = https://github.com/rewinfrey/hspec-expectations-pretty-diff
 [submodule "vendor/haskell-tree-sitter"]
 	path = vendor/haskell-tree-sitter
 	url = https://github.com/tree-sitter/haskell-tree-sitter.git
-[submodule "vendor/proto3-suite"]
-	path = vendor/proto3-suite
-	url = https://github.com/joshvera/proto3-suite.git
-[submodule "vendor/proto3-wire"]
-	path = vendor/proto3-wire
-	url = https://github.com/joshvera/proto3-wire.git

.travis.yml

@@ -29,7 +29,7 @@ before_install:
 
 install:
 - cabal new-update
-- cabal new-configure --enable-tests --write-ghc-environment-files=always
+- cabal new-configure --write-ghc-environment-files=always
 - cabal new-build --only-dependencies -j
 
 script:

cabal.project

@@ -1,3 +1,16 @@
-packages: vendor/* vendor/proto3-suite vendor/haskell-tree-sitter/languages/* semantic.cabal semantic-core/semantic-core.cabal
+packages: vendor/* vendor/haskell-tree-sitter/languages/* . semantic-core
 
-package proto3-suite
+source-repository-package
+  type: git
+  location: https://github.com/joshvera/proto3-suite.git
+  tag: e13c7099789867733f42f47a25349a826937d870
+
+source-repository-package
+  type: git
+  location: https://github.com/joshvera/proto3-wire.git
+  tag: 84664e22f01beb67870368f1f88ada5d0ad01f56
+
+source-repository-package
+  type: git
+  location: https://github.com/rewinfrey/hspec-expectations-pretty-diff
+  tag: 94af5871c24ba319f7f72fefa53c1a4d074c9a29