From 62299ecdc93b39f6a22b1f89779f55dfa735fb3c Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 14 Mar 2022 17:03:38 -0400 Subject: Made JVM "import:" syntax consistent with the other "import:"s. --- stdlib/source/program/aedifex/command/build.lux | 4 ++-- stdlib/source/program/aedifex/dependency/resolution.lux | 4 ++-- stdlib/source/program/aedifex/hash.lux | 9 +++++---- stdlib/source/program/aedifex/repository/identity.lux | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index a0cd97fd9..ecbcb703f 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -236,8 +236,8 @@ ) (import: java/lang/System - ["[1]::[0]" - ("static" getProperty [java/lang/String] "io" "try" java/lang/String)]) + "[1]::[0]" + ("static" getProperty [java/lang/String] "io" "try" java/lang/String)) (def: windows? Bit diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 1fcc77dd7..2100c1ca1 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -72,8 +72,8 @@ ) (import: java/lang/String - ["[1]::[0]" - (trim [] java/lang/String)]) + "[1]::[0]" + (trim [] java/lang/String)) (def: (verified_hash library repository version_template artifact extension hash codec exception) (All (_ h) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 30b0cdcee..23421b264 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -24,12 +24,13 @@ ... TODO: Replace with pure-Lux implementations of these algorithms ... https://en.wikipedia.org/wiki/SHA-1#SHA-1_pseudocode ... https://en.wikipedia.org/wiki/MD5#Algorithm -(import: java/lang/String) +(import: java/lang/String + "[1]::[0]") (import: java/security/MessageDigest - ["[1]::[0]" - ("static" getInstance [java/lang/String] java/security/MessageDigest) - (digest [[byte]] [byte])]) + "[1]::[0]" + ("static" getInstance [java/lang/String] java/security/MessageDigest) + (digest [[byte]] [byte])) (abstract: .public SHA-1 Any) (abstract: .public MD5 Any) diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index 8288f2d74..6ab4e380d 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -30,12 +30,12 @@ )) (import: java/util/Base64$Encoder - ["[1]::[0]" - (encodeToString [[byte]] java/lang/String)]) + "[1]::[0]" + (encodeToString [[byte]] java/lang/String)) (import: java/util/Base64 - ["[1]::[0]" - ("static" getEncoder [] java/util/Base64$Encoder)]) + "[1]::[0]" + ("static" getEncoder [] java/util/Base64$Encoder)) (def: .public (basic_auth user password) (-> User Password Text) -- cgit v1.2.3