From df6cf0d3c980e3d7240eec6cb38d86af61037725 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 8 Nov 2021 02:02:27 -0400
Subject: Sharing the same Function class between bootsrapper and JVM compiler.

---
 stdlib/commands.md                                 |  2 +-
 stdlib/project.clj                                 |  2 +-
 stdlib/project.lux                                 |  6 +-
 .../lux/tool/compiler/meta/packager/jvm.lux        | 92 +++++++++++-----------
 4 files changed, 51 insertions(+), 51 deletions(-)

(limited to 'stdlib')

diff --git a/stdlib/commands.md b/stdlib/commands.md
index 8f1ad95e5..a49441d93 100644
--- a/stdlib/commands.md
+++ b/stdlib/commands.md
@@ -40,7 +40,7 @@ cd ~/lux/stdlib/ && mvn deploy:deploy-file \
 -Dfile=target/library.tar \
 -DgroupId=com.github.luxlang \
 -DartifactId=stdlib \
--Dversion=0.6.0-SNAPSHOT \
+-Dversion=0.6.5-SNAPSHOT \
 -Dpackaging=tar
 
 cd ~/lux/stdlib/ \
diff --git a/stdlib/project.clj b/stdlib/project.clj
index 850de9fcc..82bdf265e 100644
--- a/stdlib/project.clj
+++ b/stdlib/project.clj
@@ -1,4 +1,4 @@
-(def version "0.6.4")
+(def version "0.6.5-SNAPSHOT")
 (def repo "https://github.com/LuxLang/lux")
 (def sonatype-releases "https://oss.sonatype.org/service/local/staging/deploy/maven2/")
 (def sonatype-snapshots "https://oss.sonatype.org/content/repositories/snapshots/")
diff --git a/stdlib/project.lux b/stdlib/project.lux
index f5b34f7de..1dfe84e5b 100644
--- a/stdlib/project.lux
+++ b/stdlib/project.lux
@@ -2,7 +2,7 @@
  [... An optional identity for the project.
   ... It can also be specified or overriden in a non-default profile.
   ... This will be the name given to the project when installed/deployed as a dependency.
-  "identity" ["com.github.luxlang" "stdlib" "0.6.4"]
+  "identity" ["com.github.luxlang" "stdlib" "0.6.5-SNAPSHOT"]
 
   ... Every piece of information, and the whole "info" bundle, are optional.
   "info" ["url" "https://github.com/LuxLang/lux"
@@ -41,7 +41,7 @@
  ... The following are alternative profiles to use in various situations.
  "jvm"
  [... "compiler" specifies the dependency to fetch and use as the compiler.
-  "compiler" ["com.github.luxlang" "lux-jvm" "0.6.4" "jar"]
+  "compiler" ["com.github.luxlang" "lux-jvm" "0.6.5-SNAPSHOT" "jar"]
   ... "dependencies" is an optional list of dependencies to fetch.
   ... The dependencies have the same shape as when specifying the compiler.
   ... When omitting the packaging format of the dependency, "tar" will be assumed.
@@ -70,7 +70,7 @@
   ]
 
  "ruby"
- ["compiler" ["com.github.luxlang" "lux-ruby" "0.6.4" "jar"]
+ ["compiler" ["com.github.luxlang" "lux-ruby" "0.6.5-SNAPSHOT" "jar"]
   ... The OS command to use when running Ruby tests. The default is described below.
   ... "ruby" ["ruby"]
   ]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
index 9d1fca9af..af39e83e9 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
@@ -1,51 +1,51 @@
 (.using
-  [library
-   [lux {"-" Module Definition}
-    ["[0]" ffi {"+" import: do_to}]
-    [abstract
-     ["[0]" monad {"+" Monad do}]]
-    [control
-     ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" try {"+" Try}]]
-    [data
-     ["[0]" binary {"+" Binary}]
-     ["[0]" text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" sequence]
-      ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" dictionary]
-      ["[0]" set {"+" Set}]]]
-    [math
-     [number
-      ["n" nat]
-      ["i" int]]]
-    [target
-     [jvm
-      [encoding
-       ["[0]" name]]]]
-    [world
-     ["[0]" file]]]]
-  [program
-   [compositor
-    ["[0]" static {"+" Static}]]]
-  ["[0]" // {"+" Packager}
+ [library
+  [lux {"-" Module Definition}
+   ["[0]" ffi {"+" import: do_to}]
+   [abstract
+    ["[0]" monad {"+" Monad do}]]
+   [control
+    ["[0]" maybe ("[1]#[0]" functor)]
+    ["[0]" try {"+" Try}]]
+   [data
+    ["[0]" binary {"+" Binary}]
+    ["[0]" text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" sequence]
+     ["[0]" list ("[1]#[0]" functor)]
+     ["[0]" dictionary]
+     ["[0]" set {"+" Set}]]]
+   [math
+    [number
+     ["n" nat]
+     ["i" int]]]
+   [target
+    [jvm
+     [encoding
+      ["[0]" name]]]]
+   [world
+    ["[0]" file]]]]
+ [program
+  [compositor
+   ["[0]" static {"+" Static}]]]
+ ["[0]" // {"+" Packager}
+  [//
+   ["[0]" archive {"+" Output}
+    ["[0]" descriptor {"+" Module}]
+    ["[0]" artifact]]
+   [cache
+    ["[0]" dependency]]
+   ["[0]" io "_"
+    ["[1]" archive]]
    [//
-    ["[0]" archive {"+" Output}
-     ["[0]" descriptor {"+" Module}]
-     ["[0]" artifact]]
-    [cache
-     ["[0]" dependency]]
-    ["[0]" io "_"
-     ["[1]" archive]]
-    [//
-     [language
-      ["$" lux
-       [generation {"+" Context}]
-       [phase
-        [generation
-         [jvm
-          ["[0]" runtime {"+" Definition}]]]]]]]]])
+    [language
+     ["$" lux
+      [generation {"+" Context}]
+      [phase
+       [generation
+        [jvm
+         ["[0]" runtime {"+" Definition}]]]]]]]]])
 
 (import: java/lang/Object)
 
-- 
cgit v1.2.3