Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to code dir #2020

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/hlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
- name: 'Run HLint'
uses: haskell-actions/hlint-run@v2
with:
path: '["src/", "app/", "test/"]'
path: '["code/"]'
fail-on: suggestion
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/normalize/code-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd $SCRIPT_DIR/../..

fourmolu --mode=inplace src app test scripts
fourmolu --mode=inplace code scripts
2 changes: 1 addition & 1 deletion scripts/validate/issues-for-todos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd $SCRIPT_DIR/../..


if grep --line-number --include \*.hs -riP '(TODO|FIXME|XXX)\b' src app 2>&1 | grep -vP '#\d+'; then
if grep --line-number --include \*.hs -riP '(TODO|FIXME|XXX)\b' code 2>&1 | grep -vP '#\d+'; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this fixes a bug wherein the test directory was excluded

echo "Please add a link to Issue, for example: TODO: #123"
exit 1
else
Expand Down
54 changes: 27 additions & 27 deletions swarm.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ common ghc2021-extensions
library swarm-lang
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-lang
-- cabal-gild: discover code/src/swarm-lang
exposed-modules:
Swarm.Effect.Unify
Swarm.Effect.Unify.Common
Expand Down Expand Up @@ -197,7 +197,7 @@ library swarm-lang
yaml,

build-depends: swarm:swarm-util
hs-source-dirs: src/swarm-lang
hs-source-dirs: code/src/swarm-lang
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -207,7 +207,7 @@ library swarm-lang
library swarm-topography
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-topography
-- cabal-gild: discover code/src/swarm-topography
exposed-modules:
Swarm.Game.Location
Swarm.Game.Scenario.Topography.Area
Expand Down Expand Up @@ -248,7 +248,7 @@ library swarm-topography
build-depends:
swarm:swarm-util

hs-source-dirs: src/swarm-topography
hs-source-dirs: code/src/swarm-topography
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -258,7 +258,7 @@ library swarm-topography
library swarm-scenario
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-scenario
-- cabal-gild: discover code/src/swarm-scenario
exposed-modules:
Swarm.Constant
Swarm.Game.Achievement.Definitions
Expand Down Expand Up @@ -347,7 +347,7 @@ library swarm-scenario
swarm:swarm-topography,
swarm:swarm-util,

hs-source-dirs: src/swarm-scenario
hs-source-dirs: code/src/swarm-scenario
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -357,7 +357,7 @@ library swarm-scenario
library swarm-engine
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-engine
-- cabal-gild: discover code/src/swarm-engine
exposed-modules:
Swarm.Effect
Swarm.Effect.Time
Expand Down Expand Up @@ -446,7 +446,7 @@ library swarm-engine
swarm:swarm-topography,
swarm:swarm-util,

hs-source-dirs: src/swarm-engine
hs-source-dirs: code/src/swarm-engine
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -456,7 +456,7 @@ library swarm-engine
library swarm-web
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-web
-- cabal-gild: discover code/src/swarm-web
exposed-modules:
Swarm.Web
Swarm.Web.Worldview
Expand Down Expand Up @@ -492,7 +492,7 @@ library swarm-web
swarm:swarm-tui,
swarm:swarm-util,

hs-source-dirs: src/swarm-web
hs-source-dirs: code/src/swarm-web
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -502,7 +502,7 @@ library swarm-web
library swarm-tournament
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-tournament
-- cabal-gild: discover code/src/swarm-tournament
exposed-modules:
Swarm.Web.Auth
Swarm.Web.Tournament
Expand Down Expand Up @@ -550,13 +550,13 @@ library swarm-tournament
swarm:swarm-scenario,
swarm:swarm-util,

hs-source-dirs: src/swarm-tournament
hs-source-dirs: code/src/swarm-tournament
default-language: Haskell2010

library swarm-util
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-util
-- cabal-gild: discover code/src/swarm-util
exposed-modules:
Control.Carrier.Accum.FixedStrict
Data.BoolExpr.Simplify
Expand Down Expand Up @@ -599,7 +599,7 @@ library swarm-util
witherable >=0.4 && <0.5,
yaml >=0.11 && <0.11.12.0,

hs-source-dirs: src/swarm-util
hs-source-dirs: code/src/swarm-util
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -609,7 +609,7 @@ library swarm-util
library swarm-doc
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-doc
-- cabal-gild: discover code/src/swarm-doc
exposed-modules:
Swarm.Doc.Command
Swarm.Doc.Gen
Expand Down Expand Up @@ -650,7 +650,7 @@ library swarm-doc
swarm:swarm-scenario,
swarm:swarm-util,

hs-source-dirs: src/swarm-doc
hs-source-dirs: code/src/swarm-doc
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand All @@ -660,7 +660,7 @@ library swarm-doc
library swarm-tui
import: stan-config, common, ghc2021-extensions
visibility: public
-- cabal-gild: discover src/swarm-tui
-- cabal-gild: discover code/src/swarm-tui
exposed-modules:
Swarm.TUI.Border
Swarm.TUI.Controller
Expand Down Expand Up @@ -754,7 +754,7 @@ library swarm-tui
swarm:swarm-topography,
swarm:swarm-util,

hs-source-dirs: src/swarm-tui
hs-source-dirs: code/src/swarm-tui
default-language: Haskell2010
default-extensions:
-- Avoid unexpected unevaluated thunk buildup
Expand Down Expand Up @@ -783,7 +783,7 @@ executable swarm
vty,
vty-crossplatform >=0.4 && <0.5,

hs-source-dirs: app
hs-source-dirs: code/app
default-language: Haskell2010
ghc-options: -threaded
default-extensions: ImportQualifiedPost
Expand All @@ -799,7 +799,7 @@ executable swarm-scene
swarm:swarm-scenario,
swarm:swarm-topography,

hs-source-dirs: app/scene
hs-source-dirs: code/app/scene
default-language: Haskell2010
ghc-options: -threaded
default-extensions: ImportQualifiedPost
Expand All @@ -815,7 +815,7 @@ executable swarm-docs
swarm:swarm-doc,
text,

hs-source-dirs: app/doc
hs-source-dirs: code/app/doc
default-language: Haskell2010
ghc-options: -threaded
default-extensions: ImportQualifiedPost
Expand All @@ -835,7 +835,7 @@ executable swarm-host-tournament
swarm:swarm-engine,
swarm:swarm-tournament,

hs-source-dirs: app/tournament
hs-source-dirs: code/app/tournament
default-language: Haskell2010
ghc-options: -threaded
default-extensions: ImportQualifiedPost
Expand Down Expand Up @@ -894,7 +894,7 @@ test-suite swarm-unit
swarm:swarm-tui,
swarm:swarm-util,

hs-source-dirs: test/unit
hs-source-dirs: code/test/unit
default-language: Haskell2010
ghc-options: -threaded

Expand Down Expand Up @@ -925,7 +925,7 @@ test-suite swarm-integration
swarm:swarm-tui,
swarm:swarm-util,

hs-source-dirs: test/integration
hs-source-dirs: code/test/integration
default-language: Haskell2010
ghc-options: -threaded

Expand All @@ -948,7 +948,7 @@ test-suite tournament-host
swarm:swarm-engine,
swarm:swarm-tournament,

hs-source-dirs: test/tournament-host
hs-source-dirs: code/test/tournament-host
default-language: Haskell2010
ghc-options: -threaded

Expand Down Expand Up @@ -976,14 +976,14 @@ test-suite standalone-topography
swarm:swarm-topography,
swarm:swarm-util,

hs-source-dirs: test/standalone-topography/src
hs-source-dirs: code/test/standalone-topography/src
default-language: Haskell2010
ghc-options: -threaded

benchmark benchmark
import: stan-config, common, ghc2021-extensions
main-is: Benchmark.hs
hs-source-dirs: test/bench
hs-source-dirs: code/test/bench
type: exitcode-stdio-1.0
build-depends:
base,
Expand Down