Some bug fixes.

1 files changed, 16 insertions, 14 deletions

diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 22778e25b..73c5f6608 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -1,6 +1,7 @@
 (.module:
   [library
    [lux (#- Name)
+    ["@" target]
     ["." debug]
     ["." ffi (#+ import:)]
     [abstract
@@ -83,9 +84,10 @@
     (case ?actual
       (#try.Success actual)
       (in (do {! try.monad}
-            [output (\ ! map (|>> (:as java/lang/String)
-                                  java/lang/String::trim
-                                  (:as Text))
+            [output (\ ! map (for {@.old (|>> (:as java/lang/String)
+                                              java/lang/String::trim
+                                              (:as Text))
+                                   @.jvm (|>> java/lang/String::trim)})
                        (\ utf8.codec decode actual))
              actual (|> output
                         (text.all_split_by " ")
@@ -113,10 +115,10 @@
                 [(#.Some sha-1) (#.Some md5)]
                 (#//status.Verified sha-1 md5)
 
-                [(#.Some sha-1) _]
+                [(#.Some sha-1) #.None]
                 (#//status.Partial (#.Left sha-1))
 
-                [_ (#.Some md5)]
+                [#.None (#.Some md5)]
                 (#//status.Partial (#.Right md5))
 
                 [#.None #.None]
@@ -128,10 +130,10 @@
         extension (///artifact/extension.extension type)]
     (do (try.with async.monad)
       [snapshot (///metadata/snapshot.read repository artifact)
-       .let [version_template (get@ [#///metadata/snapshot.artifact #///artifact.version] snapshot)
+       .let [version_template (value@ [#///metadata/snapshot.artifact #///artifact.version] snapshot)
              artifact_version (value.format {#value.version version_template
-                                             #value.snapshot (get@ [#///metadata/snapshot.versioning #///artifact/versioning.snapshot] snapshot)})
-             artifact (set@ #///artifact.version artifact_version artifact)]
+                                             #value.snapshot (value@ [#///metadata/snapshot.versioning #///artifact/versioning.snapshot] snapshot)})
+             artifact (with@ #///artifact.version artifact_version artifact)]
        [pom_data pom_status] (..hashed repository version_template artifact ///artifact/extension.pom)
        library_&_status (..hashed repository version_template artifact extension)]
       (\ async.monad in
@@ -156,8 +158,8 @@
 
 (exception: .public (cannot_resolve {dependency Dependency})
   (exception.report
-   ["Artifact" (%.text (///artifact.format (get@ #//.artifact dependency)))]
-   ["Type" (%.text (get@ #//.type dependency))]))
+   ["Artifact" (%.text (///artifact.format (value@ #//.artifact dependency)))]
+   ["Type" (%.text (value@ #//.type dependency))]))
 
 (template [<sigil> <name> <doing> <at>]
   [(def: (<name> console repository artifact)
@@ -184,17 +186,17 @@
 
     (#.Item repository alternatives)
     (do {! async.monad}
-      [_ (..announce_fetching console repository (get@ #//.artifact dependency))
+      [_ (..announce_fetching console repository (value@ #//.artifact dependency))
        outcome (..one repository dependency)]
       (case outcome
         (#try.Success package)
         (do !
-          [_ (..announce_success console repository (get@ #//.artifact dependency))]
+          [_ (..announce_success console repository (value@ #//.artifact dependency))]
           (in outcome))
 
         (#try.Failure error)
         (do !
-          [_ (..announce_failure console repository (get@ #//.artifact dependency))]
+          [_ (..announce_failure console repository (value@ #//.artifact dependency))]
           (any console alternatives dependency))))))
 
 (def: .public (all console repositories new_repository dependencies resolution)
@@ -213,7 +215,7 @@
          [successes failures resolution])
 
       (#.Item head tail)
-      (case (get@ [#//.artifact #///artifact.version] head)
+      (case (value@ [#//.artifact #///artifact.version] head)
         ... Skip if there is no version
         "" (recur repositories
                   successes