aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/program/aedifex/dependency
diff options
context:
space:
mode:
authorEduardo Julian2021-08-24 05:23:45 -0400
committerEduardo Julian2021-08-24 05:23:45 -0400
commit36303d6cb2ce3ab9e36d045b9516c997bd461862 (patch)
treeb9d2f1495143054d61d9af129f36833624db9dac /stdlib/source/program/aedifex/dependency
parentec1f31b5a1492d5e0ab260397291d4449483bbd9 (diff)
Outsourced the syntax for labelled type definitions to macros.
Diffstat (limited to 'stdlib/source/program/aedifex/dependency')
-rw-r--r--stdlib/source/program/aedifex/dependency/deployment.lux10
-rw-r--r--stdlib/source/program/aedifex/dependency/resolution.lux16
2 files changed, 13 insertions, 13 deletions
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index c637ae931..22788dc3d 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -111,8 +111,8 @@
#///artifact/snapshot/version/value.snapshot versioning_snapshot})
#///artifact/snapshot/version.updated now}))
... (with@ [#///metadata/snapshot.versioning #///artifact/versioning.snapshot]
- ... (list\compose (..artifacts type (product.right (value@ #///package.library package)))
- ... (..artifacts ///artifact/type.pom (product.right (value@ #///package.pom package)))))
+ ... (list\composite (..artifacts type (product.right (value@ #///package.library package)))
+ ... (..artifacts ///artifact/type.pom (product.right (value@ #///package.pom package)))))
))))
(def: .public (one repository [artifact type] package)
@@ -144,6 +144,6 @@
(-> (Repository Async) Resolution (Async (Try (Set Artifact))))
(let [! (try.with async.monad)]
(|> (dictionary.entries resolution)
- (monad.map ! (function (_ [dependency package])
- (..one repository dependency package)))
- (\ ! map (set.of_list ///artifact.hash)))))
+ (monad.each ! (function (_ [dependency package])
+ (..one repository dependency package)))
+ (\ ! each (set.of_list ///artifact.hash)))))
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 50415b61f..8de6d2423 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -84,10 +84,10 @@
(case ?actual
(#try.Success actual)
(in (do {! try.monad}
- [output (\ ! map (for {@.old (|>> (:as java/lang/String)
- java/lang/String::trim
- (:as Text))
- @.jvm (|>> java/lang/String::trim)})
+ [output (\ ! each (for {@.old (|>> (:as java/lang/String)
+ java/lang/String::trim
+ (:as Text))
+ @.jvm (|>> java/lang/String::trim)})
(\ utf8.codec decoded actual))
actual (|> output
(text.all_split_by " ")
@@ -234,15 +234,15 @@
(do !
[.let [sub_dependencies (|> package
///package.dependencies
- (try\map set.list)
+ (try\each set.list)
(try.else (list)))
... For security reasons, it's not a good idea to allow dependencies to introduce repositories.
... package_repositories (|> package
... ///package.repositories
- ... (try\map set.list)
+ ... (try\each set.list)
... (try.else (list))
- ... (list\map new_repository))
- ... sub_repositories (list\compose repositories package_repositories)
+ ... (list\each new_repository))
+ ... sub_repositories (list\composite repositories package_repositories)
sub_repositories repositories]
[successes failures resolution] (recur sub_repositories
(#.Item head successes)