From 45f35852f80ee86fd6f42bd6832fefb6ec6dbcd4 Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Mon, 20 Apr 2015 11:15:58 +0200 Subject: [PATCH] prepare merge --- .ghci | 1 - .gitignore | 17 ------- .travis.yml | 51 ------------------- CHANGELOG.md => servant-client/CHANGELOG.md | 0 LICENSE => servant-client/LICENSE | 0 README.md => servant-client/README.md | 0 Setup.hs => servant-client/Setup.hs | 0 docs.sh => servant-client/docs.sh | 0 .../servant-client.cabal | 0 {src => servant-client/src}/Servant/Client.hs | 0 .../src}/Servant/Common/BaseUrl.hs | 0 .../src}/Servant/Common/Req.hs | 0 .../test}/Servant/ClientSpec.hs | 0 .../test}/Servant/Common/BaseUrlSpec.hs | 0 {test => servant-client/test}/Spec.hs | 0 15 files changed, 69 deletions(-) delete mode 100644 .ghci delete mode 100644 .gitignore delete mode 100644 .travis.yml rename CHANGELOG.md => servant-client/CHANGELOG.md (100%) rename LICENSE => servant-client/LICENSE (100%) rename README.md => servant-client/README.md (100%) rename Setup.hs => servant-client/Setup.hs (100%) rename docs.sh => servant-client/docs.sh (100%) rename servant-client.cabal => servant-client/servant-client.cabal (100%) rename {src => servant-client/src}/Servant/Client.hs (100%) rename {src => servant-client/src}/Servant/Common/BaseUrl.hs (100%) rename {src => servant-client/src}/Servant/Common/Req.hs (100%) rename {test => servant-client/test}/Servant/ClientSpec.hs (100%) rename {test => servant-client/test}/Servant/Common/BaseUrlSpec.hs (100%) rename {test => servant-client/test}/Spec.hs (100%) diff --git a/.ghci b/.ghci deleted file mode 100644 index 40370b11..00000000 --- a/.ghci +++ /dev/null @@ -1 +0,0 @@ -:set -isrc \ No newline at end of file diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0855a79b..00000000 --- a/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -dist -cabal-dev -*.o -*.hi -*.chi -*.chs.h -*.dyn_o -*.dyn_hi -.virtualenv -.hpc -.hsenv -.cabal-sandbox/ -cabal.sandbox.config -cabal.config -*.prof -*.aux -*.hp diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 383299db..00000000 --- a/.travis.yml +++ /dev/null @@ -1,51 +0,0 @@ -language: haskell - -env: -- GHCVER=7.8.3 - -before_install: - - | - if [ $GHCVER = `ghc --numeric-version` ]; then - travis/cabal-apt-install --enable-tests $MODE - export CABAL=cabal - else - travis_retry sudo add-apt-repository -y ppa:hvr/ghc - travis_retry sudo apt-get update - travis_retry sudo apt-get install cabal-install-1.18 ghc-$GHCVER happy - export CABAL=cabal-1.18 - export PATH=/opt/ghc/$GHCVER/bin:$PATH - fi - - $CABAL update - - | - if [ $GHCVER = "head" ] || [ $GHCVER = "7.8.3" ]; then - $CABAL install happy alex - export PATH=$HOME/.cabal/bin:$PATH - fi - - git clone https://github.com/haskell-servant/servant.git - - git clone https://github.com/haskell-servant/servant-server.git - - cabal sandbox init - - cabal sandbox add-source servant - - cabal sandbox add-source servant-server - -install: - - cabal install --only-dependencies --enable-tests - -script: - - cabal configure --enable-tests --enable-library-coverage - - cabal build && cabal test - - cabal sdist - -after_script: - - cabal install hpc-coveralls - - hpc-coveralls --exclude-dir=test spec - -notifications: - irc: - channels: - - "irc.freenode.org#servant" - template: - - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}" - - "Build details: %{build_url} - Change view: %{compare_url}" - skip_join: true - on_success: change - on_failure: always diff --git a/CHANGELOG.md b/servant-client/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to servant-client/CHANGELOG.md diff --git a/LICENSE b/servant-client/LICENSE similarity index 100% rename from LICENSE rename to servant-client/LICENSE diff --git a/README.md b/servant-client/README.md similarity index 100% rename from README.md rename to servant-client/README.md diff --git a/Setup.hs b/servant-client/Setup.hs similarity index 100% rename from Setup.hs rename to servant-client/Setup.hs diff --git a/docs.sh b/servant-client/docs.sh similarity index 100% rename from docs.sh rename to servant-client/docs.sh diff --git a/servant-client.cabal b/servant-client/servant-client.cabal similarity index 100% rename from servant-client.cabal rename to servant-client/servant-client.cabal diff --git a/src/Servant/Client.hs b/servant-client/src/Servant/Client.hs similarity index 100% rename from src/Servant/Client.hs rename to servant-client/src/Servant/Client.hs diff --git a/src/Servant/Common/BaseUrl.hs b/servant-client/src/Servant/Common/BaseUrl.hs similarity index 100% rename from src/Servant/Common/BaseUrl.hs rename to servant-client/src/Servant/Common/BaseUrl.hs diff --git a/src/Servant/Common/Req.hs b/servant-client/src/Servant/Common/Req.hs similarity index 100% rename from src/Servant/Common/Req.hs rename to servant-client/src/Servant/Common/Req.hs diff --git a/test/Servant/ClientSpec.hs b/servant-client/test/Servant/ClientSpec.hs similarity index 100% rename from test/Servant/ClientSpec.hs rename to servant-client/test/Servant/ClientSpec.hs diff --git a/test/Servant/Common/BaseUrlSpec.hs b/servant-client/test/Servant/Common/BaseUrlSpec.hs similarity index 100% rename from test/Servant/Common/BaseUrlSpec.hs rename to servant-client/test/Servant/Common/BaseUrlSpec.hs diff --git a/test/Spec.hs b/servant-client/test/Spec.hs similarity index 100% rename from test/Spec.hs rename to servant-client/test/Spec.hs