From 107e97f082c74b53ad1f0bef8d2ba188463e1e5c Mon Sep 17 00:00:00 2001 From: "Thomas R. Honeyman" Date: Thu, 18 Jun 2020 20:29:46 -0700 Subject: [PATCH 1/4] Add Spago build --- bower.json | 40 ---------------------------------------- packages.dhall | 8 ++++++++ spago.dhall | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 40 deletions(-) delete mode 100644 bower.json create mode 100644 packages.dhall create mode 100644 spago.dhall diff --git a/bower.json b/bower.json deleted file mode 100644 index 93f139b..0000000 --- a/bower.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "purescript-argonaut-codecs", - "homepage": "https://github.com/purescript-contrib/purescript-argonaut-codecs", - "authors": [ - "Maxim Zimaliev ", - "Hardy Jones <>", - "John A. De Goes " - ], - "description": "Codecs for purescript argonaut", - "keywords": [ - "purescript", - "json", - "argonaut", - "encode", - "decode", - "codec", - "combinators" - ], - "repository": { - "type": "git", - "url": "git://github.com/purescript-contrib/purescript-argonaut-codecs.git" - }, - "license": "MIT", - "dependencies": { - "purescript-argonaut-core": "^5.0.0", - "purescript-generics-rep": "^6.1.1", - "purescript-integers": "^4.0.0", - "purescript-maybe": "^4.0.0", - "purescript-ordered-collections": "^1.0.0", - "purescript-foreign-object": "^2.0.0", - "purescript-record": "^2.0.0", - "purescript-nonempty": "^5.0.0", - "purescript-arrays": "^5.1.0", - "purescript-identity": "^4.1.0" - }, - "devDependencies": { - "purescript-assert": "^4.1.0", - "purescript-quickcheck": "^6.1.0" - } -} diff --git a/packages.dhall b/packages.dhall new file mode 100644 index 0000000..2dc372e --- /dev/null +++ b/packages.dhall @@ -0,0 +1,8 @@ +let upstream = + https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200615/packages.dhall sha256:5d0cfad9408c84db0a3fdcea2d708f9ed8f64297e164dc57a7cf6328706df93a + +let overrides = {=} + +let additions = {=} + +in upstream // overrides // additions diff --git a/spago.dhall b/spago.dhall new file mode 100644 index 0000000..ea52f47 --- /dev/null +++ b/spago.dhall @@ -0,0 +1,21 @@ +{ name = "argonaut-codecs" +, dependencies = + [ "argonaut-core" + , "arrays" + , "assert" + , "console" + , "effect" + , "foreign-object" + , "generics-rep" + , "identity" + , "integers" + , "maybe" + , "nonempty" + , "ordered-collections" + , "psci-support" + , "quickcheck" + , "record" + ] +, packages = ./packages.dhall +, sources = [ "src/**/*.purs", "test/**/*.purs" ] +} From 2672a5bb98532a0e525205358f7f67c7cdbff5e4 Mon Sep 17 00:00:00 2001 From: "Thomas R. Honeyman" Date: Thu, 18 Jun 2020 20:35:19 -0700 Subject: [PATCH 2/4] Update scripts --- .travis.yml | 3 --- package.json | 10 +++++----- spago.dhall | 6 +----- test/test.dhall | 5 +++++ 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 test/test.dhall diff --git a/.travis.yml b/.travis.yml index 6da455e..b339f18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,9 @@ install: - curl --location --output $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz - tar -xvf $HOME/purescript.tar.gz -C $HOME/ - chmod a+x $HOME/purescript - - npm install -g bower - npm install - - bower install --production script: - npm run -s build - - bower install - npm run -s test after_success: - >- diff --git a/package.json b/package.json index e085a1e..2a58021 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "private": true, "scripts": { - "clean": "rimraf output && rimraf .pulp-cache", - "build": "pulp build -- --censor-lib --strict", - "test": "pulp test" + "clean": "rimraf output", + "build": "spago build", + "test": "spago -x test/test.dhall test" }, "devDependencies": { - "pulp": "^14.0.0", "purescript-psa": "^0.7.3", - "rimraf": "^3.0.2" + "rimraf": "^3.0.2", + "spago": "^0.15.3" } } diff --git a/spago.dhall b/spago.dhall index ea52f47..95a5542 100644 --- a/spago.dhall +++ b/spago.dhall @@ -2,8 +2,6 @@ , dependencies = [ "argonaut-core" , "arrays" - , "assert" - , "console" , "effect" , "foreign-object" , "generics-rep" @@ -12,10 +10,8 @@ , "maybe" , "nonempty" , "ordered-collections" - , "psci-support" - , "quickcheck" , "record" ] , packages = ./packages.dhall -, sources = [ "src/**/*.purs", "test/**/*.purs" ] +, sources = [ "src/**/*.purs" ] } diff --git a/test/test.dhall b/test/test.dhall new file mode 100644 index 0000000..5ddaef9 --- /dev/null +++ b/test/test.dhall @@ -0,0 +1,5 @@ +let conf = ../spago.dhall +in conf // + { dependencies = conf.dependencies # [ "assert", "console", "quickcheck", "psci-support" ] + , sources = conf.sources # [ "test/**/*.purs" ] + } From 8c04edf18e132ff530edeac446ffbbd08505a42c Mon Sep 17 00:00:00 2001 From: "Thomas R. Honeyman" Date: Thu, 18 Jun 2020 20:36:44 -0700 Subject: [PATCH 3/4] Add missing fields to Spago file --- spago.dhall | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spago.dhall b/spago.dhall index 95a5542..4539016 100644 --- a/spago.dhall +++ b/spago.dhall @@ -1,4 +1,6 @@ { name = "argonaut-codecs" +, license = "MIT" +, repository = "https://github.com/purescript-contrib/purescript-argonaut-codecs" , dependencies = [ "argonaut-core" , "arrays" From 350ca5bc0aa3f687a2d73db8c6b4f86c3dacd543 Mon Sep 17 00:00:00 2001 From: "Thomas R. Honeyman" Date: Thu, 18 Jun 2020 20:38:21 -0700 Subject: [PATCH 4/4] Generate bowerfile from Spago --- bower.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..aec0e42 --- /dev/null +++ b/bower.json @@ -0,0 +1,29 @@ +{ + "name": "purescript-argonaut-codecs", + "license": [ + "MIT" + ], + "repository": { + "type": "git", + "url": "https://github.com/purescript-contrib/purescript-argonaut-codecs" + }, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "output" + ], + "dependencies": { + "purescript-argonaut-core": "^v5.0.2", + "purescript-arrays": "^v5.3.1", + "purescript-effect": "^v2.0.1", + "purescript-foreign-object": "^v2.0.3", + "purescript-generics-rep": "^v6.1.1", + "purescript-identity": "^v4.1.0", + "purescript-integers": "^v4.0.0", + "purescript-maybe": "^v4.0.1", + "purescript-nonempty": "^v5.0.0", + "purescript-ordered-collections": "^v1.6.1", + "purescript-record": "^v2.0.2" + } +}