diff --git a/Makefile b/Makefile index 7471024..5475810 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,8 @@ clean-build: .PHONY: clean-deps clean-deps: - @rm -rf deps/ + @juvix clean + @(cd tests && exec juvix clean) .PHONY: clean clean: clean-deps clean-build diff --git a/Package.juvix b/Package.juvix index b83fde9..7226ecd 100644 --- a/Package.juvix +++ b/Package.juvix @@ -1,9 +1,9 @@ module Package; -import PackageDescription.V1 open; +import PackageDescription.V2 open; package : Package := defaultPackage {name := "test"; - version := mkVersion 0 7 0; - dependencies := [github "anoma" "juvix-stdlib" "v0.0.1"]}; + version := mkVersion 0 8 0; + dependencies := [github "anoma" "juvix-stdlib" "v0.1.0"]}; diff --git a/Test/JuvixUnit.juvix b/Test/JuvixUnit.juvix index 8257618..171217e 100644 --- a/Test/JuvixUnit.juvix +++ b/Test/JuvixUnit.juvix @@ -1,7 +1,6 @@ module Test.JuvixUnit; -import Stdlib.Prelude open hiding {fail}; - +import Test.Prelude open; import Stdlib.Debug.Fail as Fail; type Assertion := diff --git a/Test/Prelude.juvix b/Test/Prelude.juvix new file mode 100644 index 0000000..236ad28 --- /dev/null +++ b/Test/Prelude.juvix @@ -0,0 +1,10 @@ +module Test.Prelude; + +import Juvix.Builtin.V1 open public; +import Stdlib.Data.List.Base open using {any; foldr} public; +import Stdlib.Data.Bool.Base open using {if; not} public; +import Stdlib.Data.Maybe.Base open using {maybe} public; +import Stdlib.Function open public; +import Stdlib.System.IO.Base open public; +import Stdlib.System.IO.String open public; +import Stdlib.Trait.Eq open public; diff --git a/juvix.lock.yaml b/juvix.lock.yaml index c7e1d26..12487fa 100644 --- a/juvix.lock.yaml +++ b/juvix.lock.yaml @@ -1,9 +1,11 @@ # This file was autogenerated by Juvix version 0.5.4. # Do not edit this file manually. +version: 2 +checksum: bb2c92390bf49873ae476fb3e816d2f9e2e86dbec0e584a0ccfe552ec0f2bda1 dependencies: - git: name: anoma_juvix-stdlib - ref: f68b0614ad695eaa13ead42f3466e0a78219f826 + ref: 183d4e9329a648b339ebecf2122b3e9621c99ee8 url: https://github.com/anoma/juvix-stdlib dependencies: [] diff --git a/tests/Package.juvix b/tests/Package.juvix index 0416bb0..75766ee 100644 --- a/tests/Package.juvix +++ b/tests/Package.juvix @@ -1,8 +1,10 @@ module Package; -import PackageDescription.V1 open; +import PackageDescription.V2 open; package : Package := defaultPackage {name := "tests"; - dependencies := [defaultStdlib; path "../"]}; + dependencies := [ path "../" + ; github "anoma" "juvix-stdlib" "v0.1.0" + ]}; diff --git a/tests/juvix.lock.yaml b/tests/juvix.lock.yaml index 5f73d82..a4690e6 100644 --- a/tests/juvix.lock.yaml +++ b/tests/juvix.lock.yaml @@ -1,13 +1,18 @@ # This file was autogenerated by Juvix version 0.5.4. # Do not edit this file manually. +version: 2 +checksum: bc44ac3a4265ab42f42880ebe71560cce855411ca98574181715b96d34543bb8 dependencies: -- path: .juvix-build/stdlib/ - dependencies: [] - path: ../ dependencies: - git: name: anoma_juvix-stdlib - ref: f68b0614ad695eaa13ead42f3466e0a78219f826 + ref: 183d4e9329a648b339ebecf2122b3e9621c99ee8 url: https://github.com/anoma/juvix-stdlib dependencies: [] +- git: + name: anoma_juvix-stdlib + ref: 183d4e9329a648b339ebecf2122b3e9621c99ee8 + url: https://github.com/anoma/juvix-stdlib + dependencies: []