From 21e554333f4a50c6ecd268f46cd3ada85896f121 Mon Sep 17 00:00:00 2001
From: thautwarm <twshere@outlook.com>
Date: Fri, 27 Nov 2020 22:12:17 +0900
Subject: [PATCH] up

---
 .travis.yml                 | 12 ++++++------
 RBNF.cabal                  | 13 ++-----------
 build-release.sh            | 10 +++++++++-
 package.yaml                |  6 +++---
 src/RBNF/BackEnds/Python.hs |  2 +-
 stack.yaml                  |  2 +-
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0de4a8a..a6aa9c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,23 +9,23 @@ cache:
   - "$HOME/.ghc"
 
 python: 3.7
-env: BUILD=stack ARGS="--resolver lts-13.15"
+env: BUILD=stack ARGS="--resolver lts-14.20"
 jobs:
   include:
   - os: linux
-    compiler: ": #stack 8.6.4"
+    compiler: ": #stack 8.6.5"
 
   - os: osx
     osx_image: xcode12
-    compiler: ": #stack 8.6.4 osx"
+    compiler: ": #stack 8.6.5 osx"
  
   - os: osx
     osx_image: xcode11
-    compiler: ": #stack 8.6.4 osx"
+    compiler: ": #stack 8.6.5 osx"
    
   - os: osx
     osx_image: xcode10
-    compiler: ": #stack 8.6.4 osx"
+    compiler: ": #stack 8.6.5 osx"
 
 
 before_install:
@@ -68,7 +68,7 @@ deploy:
   provider: releases
   api_key: $GH_TK
   file: $ZIP_FILE
-  draft: true
+  skip_cleanup: true
   on:
     branch: cfg
 
diff --git a/RBNF.cabal b/RBNF.cabal
index 2e20a10..95fbcd7 100644
--- a/RBNF.cabal
+++ b/RBNF.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 8ad26b096f0368f3ec44163735c43b0a0cc96dc62f05faa301e0ecfcf3df81d1
+-- hash: fe22c05694f04752a14d7673c350444557be150f2da96f35a49ee2aae035e08a
 
 name:           RBNF
 version:        0.1.0.0
@@ -53,16 +53,13 @@ library
   default-extensions: ViewPatterns DeriveGeneric DeriveFunctor DeriveTraversable LambdaCase TemplateHaskell DuplicateRecordFields StandaloneDeriving ExistentialQuantification MultiParamTypeClasses NamedFieldPuns PartialTypeSignatures FlexibleInstances
   ghc-options: -fno-warn-partial-type-signatures -Wall -Wno-name-shadowing
   build-depends:
-      aeson
-    , base >=4.7 && <5
+      base >=4.7 && <5
     , containers
     , lens
     , mtl
-    , parsec
     , prettyprinter
     , text
     , transformers
-    , utf8-string
     , vector
   if os(darwin)
     ghc-options: -Wall -O2
@@ -83,16 +80,13 @@ executable fff-lex
   ghc-options: -fno-warn-partial-type-signatures -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       RBNF
-    , aeson
     , base >=4.7 && <5
     , containers
     , lens
     , mtl
-    , parsec
     , prettyprinter
     , text
     , transformers
-    , utf8-string
     , vector
   if os(darwin)
     ghc-options: -Wall -O2
@@ -113,16 +107,13 @@ executable fff-pgen
   ghc-options: -fno-warn-partial-type-signatures -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       RBNF
-    , aeson
     , base >=4.7 && <5
     , containers
     , lens
     , mtl
-    , parsec
     , prettyprinter
     , text
     , transformers
-    , utf8-string
     , vector
   if os(darwin)
     ghc-options: -Wall -O2
diff --git a/build-release.sh b/build-release.sh
index bebf0df..3f70ba7 100644
--- a/build-release.sh
+++ b/build-release.sh
@@ -1,5 +1,13 @@
 [ -d hsbin-dist ] || mkdir hsbin-dist
+
+if [ -f python ]
+then
+    PY=python
+else
+    PY=python3
+fi
+
 cp `stack path --dist-dir`/build/fff-lex/fff-lex hsbin-dist/
 cp `stack path --dist-dir`/build/fff-pgen/fff-pgen hsbin-dist/
-export ZIP_FILE="fff-`python release-env.py plat`-`python version.py`.zip"
+export ZIP_FILE="fff-`$PY release-env.py plat`-`$PY version.py`.zip"
 zip -r $ZIP_FILE hsbin-dist/*
diff --git a/package.yaml b/package.yaml
index 352b0ec..b876d2f 100644
--- a/package.yaml
+++ b/package.yaml
@@ -61,11 +61,11 @@ dependencies:
 - containers
 - lens
 - vector
-- aeson
 - transformers
 - prettyprinter
-- utf8-string
-- parsec
+# - utf8-string
+# - parsec
+# - aeson
 library:
   source-dirs:
   - src
diff --git a/src/RBNF/BackEnds/Python.hs b/src/RBNF/BackEnds/Python.hs
index 9565636..a92b6f7 100644
--- a/src/RBNF/BackEnds/Python.hs
+++ b/src/RBNF/BackEnds/Python.hs
@@ -10,7 +10,7 @@ import           RBNF.IRs.MarisaLibrary
 import           RBNF.Name
 import           RBNF.Utils
 import           Control.Monad.State
-import           Codec.Binary.UTF8.String      as UTF8
+-- import           Codec.Binary.UTF8.String      as UTF8
 
 import qualified Data.Text                     as T
 import qualified Data.Set                      as S
diff --git a/stack.yaml b/stack.yaml
index 884bb23..a5d1a1a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
 flags: {}
 packages:
 - .
-resolver: lts-13.15
+resolver: lts-14.20