submodule reflex-platform

.gitignore

@@ -6,5 +6,4 @@ log
 *.webapp
 *.stats
 out
-reflex-platform
 /.stack-work/

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "deps/reflex-dom"]
-	path = deps/reflex-dom
-	url = https://github.com/reflex-frp/reflex-dom.git
-[submodule "deps/reflex"]
-	path = deps/reflex
-	url = https://github.com/reflex-frp/reflex.git
 [submodule "deps/http-api-data"]
 	path = deps/http-api-data
 	url = https://github.com/fizruk/http-api-data
@@ -13,3 +7,6 @@
 [submodule "deps/servant-snap"]
 	path = deps/servant-snap
 	url = https://github.com/haskell-servant/servant-snap
+[submodule "deps/reflex-platform"]
+	path = deps/reflex-platform
+	url = https://github.com/reflex-frp/reflex-platform

.travis.yml

@@ -35,10 +35,9 @@ install:
           $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
    fi
  - travis_retry cabal update -v
- - git clone https://github.com/reflex-frp/reflex-platform
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - reflex-platform/work-on ./overrides-ghc.nix ./testserver --command "cd testserver && cabal configure -fExample && cabal build"
- - reflex-platform/work-on ghc ./testdriver --command "cd testdriver && cabal configure && cabal build"
+ - deps/reflex-platform/work-on ./overrides-ghc.nix ./testserver --command "cd testserver && cabal configure -fExample && cabal build"
+ - deps/reflex-platform/work-on ghc ./testdriver --command "cd testdriver && cabal configure && cabal build"
  - cd testserver && dist/build/back/back -p 8000 &
  - sleep 3
  - phantomjs --webdriver=127.0.0.1:4444 &

build.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build && exec/toSite.sh"
+deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build && exec/toSite.sh"

deps/reflex

@@ -1 +0,0 @@
-Subproject commit 2e9a8de650857424fb93b372c6d00fda5e99d380

deps/reflex-dom

@@ -1 +0,0 @@
-Subproject commit f0d16ecd85474a0f09bf995278453448812796af

deps/reflex-platform

@@ -0,0 +1 @@
+Subproject commit 900e8132c43b460a6dd559d1bcc114a89b5ac92c