Merge packages into one (#79)

toku-sa-n · Apr 21, 2024 · 63f06c2 · 63f06c2
1 parent f1c37cf
commit 63f06c2
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 95 deletions.
diff --git a/bin/Setup.hs → Setup.hs b/bin/Setup.hs → Setup.hs
diff --git a/bin/app/Main.hs → app/Main.hs b/bin/app/Main.hs → app/Main.hs
diff --git a/bin/gimlight.cabal → gimlight.cabal b/bin/gimlight.cabal → gimlight.cabal
@@ -15,6  15,7 @@ author:         Hiroki Tokunaga
 maintainer:     [email protected]
 copyright:      2024 Hiroki Tokunaga
 license:        AGPL-3.0-or-later
 license-file:   LICENSE
 build-type:     Simple
 
 source-repository head
@@ -23,6  24,7 @@ source-repository head
 
 library
   exposed-modules:
       Gimlight.Logic.GameModel
       Gimlight.UI
   other-modules:
       Paths_gimlight
@@ -32,7  34,6 @@ library
       src
   build-depends:
       base >=4.7 && <5
-    , gimlight-logic
     , monomer
     , text
   default-language: Haskell2010

diff --git a/logic/gimlight-logic.cabal b/logic/gimlight-logic.cabal
diff --git a/logic/package.yaml b/logic/package.yaml
diff --git a/logic/test/Spec.hs b/logic/test/Spec.hs
diff --git a/bin/package.yaml → package.yaml b/bin/package.yaml → package.yaml
@@ -17,7  17,6 @@ dependencies:
 library:
   source-dirs: src
   dependencies:
-    - gimlight-logic
     - monomer
     - text
 

diff --git a/logic/src/Gimlight/GameModel.hs → src/Gimlight/Logic/GameModel.hs b/logic/src/Gimlight/GameModel.hs → src/Gimlight/Logic/GameModel.hs
@@ -2,7  2,7 @@
 {-# LANGUAGE Safe                     #-}
 {-# LANGUAGE StandaloneKindSignatures #-}
 
-module Gimlight.GameModel
 module Gimlight.Logic.GameModel
   ( GameModel
   , initGameModel
   , increment

diff --git a/bin/src/Gimlight/UI.hs → src/Gimlight/UI.hs b/bin/src/Gimlight/UI.hs → src/Gimlight/UI.hs
@@ -6,14  6,15 @@ module Gimlight.UI
   ( start
   ) where
 
-import           Data.Text          (pack)
-import           Gimlight.GameModel (GameModel, getCount, increment,
-                                     initGameModel)
-import           Monomer            (AppConfig, AppEventResponse,
-                                     EventResponse (Model), WidgetEnv,
-                                     WidgetNode, appFontDef, appTheme,
-                                     darkTheme, keystroke, label, startApp)
-import           Prelude            (IO, Show (show), ($), (<>))
 import           Data.Text                (pack)
 import           Gimlight.Logic.GameModel (GameModel, getCount, increment,
                                            initGameModel)
 import           Monomer                  (AppConfig, AppEventResponse,
                                            EventResponse (Model), WidgetEnv,
                                            WidgetNode, appFontDef, appTheme,
                                            darkTheme, keystroke, label,
                                            startApp)
 import           Prelude                  (IO, Show (show), ($), (<>))
 
 handleEvent ::
      WidgetEnv GameModel ()

diff --git a/stack.yaml b/stack.yaml
@@ -1,8  1,7 @@
 resolver: lts-22.15
 
 packages:
-  - bin
-  - logic
   - .
 
 # As most of packages are inferred as `unsafe`, building with `-Wunsafe` is
 # almost impossible.

diff --git a/bin/test/Spec.hs → test/Spec.hs b/bin/test/Spec.hs → test/Spec.hs