From bf3c03db9dcce2cfb24e5ecc95d8c424961f889c Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Mon, 5 Apr 2021 12:10:50 -0400 Subject: [PATCH] Spork deps --- bagatto-require.janet | 2 +- bagatto.janet | 7 ++++--- main.janet | 4 ++-- project.janet | 6 ++---- src/core.janet | 4 ++-- src/env.janet | 2 +- src/writers.janet | 2 +- test/bagatto.janet | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/bagatto-require.janet b/bagatto-require.janet index bb13aef..bcc280e 100644 --- a/bagatto-require.janet +++ b/bagatto-require.janet @@ -1,3 +1,3 @@ (import /bagatto :export true) -(import path) +(import spork/path) (import sh :export true) diff --git a/bagatto.janet b/bagatto.janet index 2ff6337..223285b 100644 --- a/bagatto.janet +++ b/bagatto.janet @@ -1,9 +1,10 @@ +(import spork/temple) +(import spork/path) + +(import json) (import sh) -(import temple) (import markable) -(import path) (import jdn) -(import json) (import mago) (import /src/multimarkdown) diff --git a/main.janet b/main.janet index 65220a2..dadc78e 100644 --- a/main.janet +++ b/main.janet @@ -1,5 +1,5 @@ -(import temple) -(import argparse :prefix "") +(import spork/temple) +(import spork/argparse :prefix "") (import /src/core) (import /src/error) diff --git a/project.janet b/project.janet index a45f1c5..831e1bb 100644 --- a/project.janet +++ b/project.janet @@ -2,12 +2,10 @@ :name "bagatto" # required :description "an extensible, transparent static site generator" :dependencies ["https://github.com/andrewchambers/janet-sh.git" - "https://git.sr.ht/~bakpakin/temple" + "spork" + "https://github.com/janet-lang/json.git" "https://github.com/pyrmont/markable" - "https://github.com/janet-lang/path.git" "https://github.com/andrewchambers/janet-jdn.git" - "https://github.com/janet-lang/json.git" - "https://github.com/janet-lang/argparse.git" "https://github.com/pyrmont/testament" "https://git.sr.ht/~subsetpark/mago"]) diff --git a/src/core.janet b/src/core.janet index f058789..348c8a0 100644 --- a/src/core.janet +++ b/src/core.janet @@ -1,5 +1,5 @@ -(import path) -(import temple) +(import spork/path) +(import spork/temple) (import /src/util) (import /src/error) diff --git a/src/env.janet b/src/env.janet index c2a979e..9cf2fd3 100644 --- a/src/env.janet +++ b/src/env.janet @@ -1,4 +1,4 @@ -(import temple) +(import spork/temple) (def required-checks @{}) (def exec-blacklist @{}) diff --git a/src/writers.janet b/src/writers.janet index 5e6724f..1c3f3bd 100644 --- a/src/writers.janet +++ b/src/writers.janet @@ -1,4 +1,4 @@ -(import path) +(import spork/path) (import /src/util) (import /src/threads) diff --git a/test/bagatto.janet b/test/bagatto.janet index ed3da76..8377c9a 100644 --- a/test/bagatto.janet +++ b/test/bagatto.janet @@ -1,5 +1,5 @@ (import testament :prefix "" :exit true) -(import temple) +(import spork/temple) (import /bagatto) -- 2.45.2