diff options
Diffstat (limited to '')
8 files changed, 37 insertions, 37 deletions
diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux index 42bbc6a4f..e6aaf9e18 100644 --- a/stdlib/source/program/aedifex/artifact/extension.lux +++ b/stdlib/source/program/aedifex/artifact/extension.lux @@ -33,6 +33,6 @@ [jvm_library] [js_library] [pom] - [sha-1] + [sha1] [md5] ) diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux index 3fad47295..a960c1443 100644 --- a/stdlib/source/program/aedifex/artifact/type.lux +++ b/stdlib/source/program/aedifex/artifact/type.lux @@ -1,6 +1,6 @@ (.require - [library - [lux (.except Type)]]) + [library + [lux (.except Type)]]) ... https://maven.apache.org/ref/3.6.3/maven-core/artifact-handlers.html (type .public Type @@ -15,6 +15,6 @@ ["jar" jvm_library] ["js" js_library] ["pom" pom] - ["sha1" sha-1] + ["sha1" sha1] ["md5" md5] ) diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux index 5a2496648..eb0e4d3ec 100644 --- a/stdlib/source/program/aedifex/command/deploy/release.lux +++ b/stdlib/source/program/aedifex/command/deploy/release.lux @@ -97,7 +97,7 @@ [pom ////artifact/extension.pom] [tar ////artifact/extension.lux_library] [jar ////artifact/extension.jvm_library] - [sha-1 ////artifact/extension.sha-1] + [sha1 ////artifact/extension.sha1] [md5 ////artifact/extension.md5] ) @@ -144,10 +144,10 @@ (at utf8.codec encoded) (at remote upload (..md5 artifact))) _ (|> it - ////hash.sha-1 - (at ////hash.sha-1_codec encoded) + ////hash.sha1 + (at ////hash.sha1_codec encoded) (at utf8.codec encoded) - (at remote upload (..sha-1 artifact))) + (at remote upload (..sha1 artifact))) _ (..release_unsigned_artifact! local remote signature)] (in []))) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index c74eac1ee..998298ae3 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -59,20 +59,20 @@ {///dependency/status.#Partial partial} (when partial - {.#Left sha-1} - (deploy_hash ///hash.sha-1_codec ///artifact/extension.sha-1 sha-1) + {.#Left sha1} + (deploy_hash ///hash.sha1_codec ///artifact/extension.sha1 sha1) {.#Right md5} (deploy_hash ///hash.md5_codec ///artifact/extension.md5 md5)) - {///dependency/status.#Verified sha-1 md5} + {///dependency/status.#Verified sha1 md5} (do ! - [_ (deploy_hash ///hash.sha-1_codec ///artifact/extension.sha-1 sha-1)] + [_ (deploy_hash ///hash.sha1_codec ///artifact/extension.sha1 sha1)] (deploy_hash ///hash.md5_codec ///artifact/extension.md5 md5)))))) (def (artifacts type status) (-> ///artifact/type.Type Status (List ///artifact/type.Type)) - (with_expansions [<sha-1> (format type ///artifact/extension.sha-1) + (with_expansions [<sha1> (format type ///artifact/extension.sha1) <md5> (format type ///artifact/extension.md5)] (list.partial type (when status @@ -81,11 +81,11 @@ {///dependency/status.#Partial partial} (list (when partial - {.#Left _} <sha-1> + {.#Left _} <sha1> {.#Right _} <md5>)) {///dependency/status.#Verified _} - (list <sha-1> <md5>))))) + (list <sha1> <md5>))))) (def (update_snapshot [artifact type] now snapshot) (-> Dependency Instant Metadata (Try Metadata)) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 571d2d966..84879b93d 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -44,7 +44,7 @@ ["[1][0]" status (.only Status)] ["/[1]" // ["/" profile] - ["[1][0]" hash (.only Hash SHA-1 MD5)] + ["[1][0]" hash (.only Hash SHA1 MD5)] ["[1][0]" pom] ["[1][0]" package (.only Package)] ["[1][0]" artifact (.only Version Artifact) @@ -67,7 +67,7 @@ ["Extension" (%.text extension)] ["Hash" (%.text hash)])))] - [sha-1_does_not_match] + [sha1_does_not_match] [md5_does_not_match] ) @@ -104,18 +104,18 @@ (-> (Repository Async) Version Artifact Extension (Async (Try [Binary Status]))) (do (try.with async.monad) [data (at repository download (///repository/remote.uri version_template artifact extension)) - ?sha-1 (..verified_hash data - repository version_template artifact (format extension ///artifact/extension.sha-1) - ///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match) + ?sha1 (..verified_hash data + repository version_template artifact (format extension ///artifact/extension.sha1) + ///hash.sha1 ///hash.sha1_codec ..sha1_does_not_match) ?md5 (..verified_hash data repository version_template artifact (format extension ///artifact/extension.md5) ///hash.md5 ///hash.md5_codec ..md5_does_not_match)] - (in [data (when [?sha-1 ?md5] - [{.#Some sha-1} {.#Some md5}] - {//status.#Verified sha-1 md5} + (in [data (when [?sha1 ?md5] + [{.#Some sha1} {.#Some md5}] + {//status.#Verified sha1 md5} - [{.#Some sha-1} {.#None}] - {//status.#Partial {.#Left sha-1}} + [{.#Some sha1} {.#None}] + {//status.#Partial {.#Left sha1}} [{.#None} {.#Some md5}] {//status.#Partial {.#Right md5}} diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux index 2ce288eec..19235595d 100644 --- a/stdlib/source/program/aedifex/dependency/status.lux +++ b/stdlib/source/program/aedifex/dependency/status.lux @@ -8,14 +8,14 @@ ["[0]" sum] ["[0]" product]]]] ["[0]" /// - ["[1][0]" hash (.only Hash SHA-1 MD5)]]) + ["[1][0]" hash (.only Hash SHA1 MD5)]]) (type .public Status (Variant {#Unverified} - {#Partial (Either (Hash SHA-1) + {#Partial (Either (Hash SHA1) (Hash MD5))} - {#Verified (Hash SHA-1) (Hash MD5)})) + {#Verified (Hash SHA1) (Hash MD5)})) (def any_equivalence (Equivalence Any) @@ -38,5 +38,5 @@ (def .public (verified payload) (-> Binary Status) {#Verified - (///hash.sha-1 payload) + (///hash.sha1 payload) (///hash.md5 payload)}) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index a83752014..d58f2d23e 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -35,7 +35,7 @@ ("static" getInstance [java/lang/String] java/security/MessageDigest) (digest [[byte]] [byte])) -(primitive .public SHA-1 Any) +(primitive .public SHA1 Any) (primitive .public MD5 Any) (primitive .public (Hash h) @@ -52,7 +52,7 @@ (java/security/MessageDigest::digest [value]) abstraction))] - [sha-1 ..SHA-1 "SHA-1"] + [sha1 ..SHA1 "SHA1"] [md5 ..MD5 "MD5"] ) @@ -71,7 +71,7 @@ Nat <factor>)] - [20 sha-1::size] + [20 sha1::size] [16 md5::size] ) @@ -96,7 +96,7 @@ ["Expected size" (%.nat <size>)] ["Actual size" (%.nat (binary.size data))])))] - [not_a_sha-1 ..sha-1::size] + [not_a_sha1 ..sha1::size] [not_a_md5 ..md5::size] ) @@ -107,7 +107,7 @@ {try.#Success (abstraction data)} (exception.except <exception> [data])))] - [as_sha-1 SHA-1 ..sha-1::size ..not_a_sha-1] + [as_sha1 SHA1 ..sha1::size ..not_a_sha1] [as_md5 MD5 ..md5::size ..not_a_md5] ) @@ -158,7 +158,7 @@ (def encoded (|>> representation ..encoded)) (def decoded (..decoded <nat> <constructor>))))] - [sha-1_codec SHA-1 ..sha-1::size ..as_sha-1] + [sha1_codec SHA1 ..sha1::size ..as_sha1] [md5_codec MD5 ..md5::size ..as_md5] ) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 70f925d84..ace318f61 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -51,12 +51,12 @@ (-> XML Binary Package) [#origin {//origin.#Local ""} #library [library - {//status.#Verified (//hash.sha-1 library) + {//status.#Verified (//hash.sha1 library) (//hash.md5 library)}] #pom (let [binary_pom (|> pom (at xml.codec encoded) (at utf8.codec encoded))] [pom binary_pom - {//status.#Verified (//hash.sha-1 binary_pom) + {//status.#Verified (//hash.sha1 binary_pom) (//hash.md5 binary_pom)}])]) (def .public dependencies |