finos · DamianReeves · Apr 3, 2024 · Apr 1, 2024 · Apr 1, 2024 · Apr 1, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,8 +35,16 @@ jobs:
           java-version: "17"
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
+      - name: Setup proto and moon toolchains
+        uses: moonrepo/setup-toolchain@v0.3.1
+        with:
+          auto-install: true
+
+      - name: Install tooling
+        run: |
+          ./build.sh install
       - name: Lint code
-        run: ./mill __.checkFormat
+        run: ./build.sh lint
 
   test-js:
     runs-on: ubuntu-latest

diff --git a/.moon/tasks.yml b/.moon/tasks.yml
@@ -1,8 +1,24 @@
 $schema: "https://moonrepo.dev/schemas/tasks.json"
 tasks:
   build:
+    inputs: []
     deps:
       - target: "~:morphir-elm-build"
         optional: true
       - target: "~:elm-library-build"
         optional: true
+  fmt:
+    inputs: []
+    deps:
+      - target: "~:elm-format"
+        optional: true
+      - target: "~:scala-format"
+        optional: true
+
+  lint:
+    inputs: []
+    deps:
+      - target: "~:elm-lint"
+        optional: true
+      - target: "~:scala-lint"
+        optional: true
diff --git a/.moon/tasks/tag-elm.yml b/.moon/tasks/tag-elm.yml
@@ -1,22 +1,15 @@
 fileGroups:
   elmSources:
-    - "src/**/*.elm"
+    - "src"
 tasks:
-  lint-elm-sources:
+  elm-lint:
     command: |
-      elm-format @files(elmSources) --validate
+      elm-format @dirs(elmSources) @files(elmSources) --validate --yes
     inputs:
-      - "@globs(elmSources)"
-  lint:
-    deps:
-      - "~:lint-elm-sources"
+      - "@files(elmSources)"
 
   elm-format:
     command: |
-      elm-format @files(elmSources) --yes
+      elm-format @dirs(elmSources) @files(elmSources) --yes
     inputs:
-      - "@globs(elmSources)"
-
-  fmt:
-    deps:
-      - "~:elm-format"
+      - "@files(elmSources)"
diff --git a/.moon/tasks/tag-morphir-elm.yml b/.moon/tasks/tag-morphir-elm.yml
@@ -30,7 +30,7 @@ tasks:
       - "@files(morphirProjectFiles)"
       - "@files(morphirElmArtifacts)"
       - "package.json"
-      - "@globs(morphirElmSources)"
+      - "@files(morphirElmSources)"
     outputs:
       - "morphir-hashes.json"
       - "morphir-ir.json"
diff --git a/.moon/workspace.yml b/.moon/workspace.yml
@@ -15,6 +15,7 @@ projects:
   globs:
     - "examples/morphir-elm-projects/unit-test-framework/*"
   sources:
+    morphir: "."
    evaluator-tests: "examples/morphir-elm-projects/evaluator-tests"
     examples/finance: "examples/morphir-elm-projects/finance"
     sdks/morphir-unit-test: "morphir-elm/sdks/morphir-unit-test"

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.15.0
+20.10.0
diff --git a/.prototools b/.prototools
@@ -1,5 +1,5 @@
 bun = "1.0.35"
-moon = "1.23.1"
+moon = "1.23.3"
 
 [plugins]
 moon = "source:https://raw.githubusercontent.com/moonrepo/moon/master/proto-plugin.toml"
diff --git a/build.sh b/build.sh
@@ -151,7 +151,7 @@ subcommand=$_arg_command
 leftovers=$_arg_leftovers
 
 # Scala versions
-default_scala_version="3.3.1"
+default_scala_version="3.3.3"
 scalaVersion=$_arg_scala_version
 scalaVersions=(${_arg_scala_version[@]})
 
@@ -277,13 +277,16 @@ case "$subcommand" in
 		moon run :build  --query "tag=[elm, morphir-elm]"    
 		;;
 	"fmt")
-		./mill Alias/run fmt; moon run :fmt
+		moon run :fmt
+		;;
+	"format")
+		moon run :fmt
 		;;
 	"install")
 		bun install
 		;;
 	"lint")
-		./mill Alias/run checkfmt && moon run :lint
+		moon run :lint
 		;;
 	"run")
 		moon run "$leftovers"

diff --git a/bun.lockb b/bun.lockb
diff --git a/examples/morphir-elm-projects/evaluator-tests/elm.json b/examples/morphir-elm-projects/evaluator-tests/elm.json
@@ -1,14 +1,58 @@
 {
-    "type": "package",
-    "name": "finos/morphir-evaluator-tests",
-    "summary": "Morphir Evaluator Tests",
-    "license": "Apache-2.0",
-    "version": "1.0.0",
-    "exposed-modules": [],
-    "elm-version": "0.19.0 <= v < 0.20.0",
+    "type": "application",
+    "source-directories": [
+        "src"
+    ],
+    "elm-version": "0.19.1",
     "dependencies": {
-        "elm/core": "1.0.0 <= v < 2.0.0",
-        "finos/morphir-elm": "21.0.1 <= v < 22.0.0"
+        "direct": {
+            "elm/core": "1.0.5",
+            "finos/morphir-elm": "21.0.1"
+        },
+        "indirect": {
+            "avh4/elm-color": "1.0.0",
+            "avh4/elm-fifo": "1.0.4",
+            "chain-partners/elm-bignum": "1.0.1",
+            "cmditch/elm-bigint": "1.0.1",
+            "cuducos/elm-format-number": "8.1.4",
+            "dillonkearns/elm-markdown": "7.0.1",
+            "dosarf/elm-tree-view": "3.0.0",
+            "elm/browser": "1.0.2",
+            "elm/bytes": "1.0.8",
+            "elm/html": "1.0.0",
+            "elm/json": "1.1.3",
+            "elm/parser": "1.1.0",
+            "elm/random": "1.0.0",
+            "elm/regex": "1.0.0",
+            "elm/svg": "1.0.1",
+            "elm/time": "1.0.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.3",
+            "elm-community/graph": "6.0.0",
+            "elm-community/intdict": "3.0.0",
+            "elm-community/list-extra": "8.7.0",
+            "elm-community/maybe-extra": "5.3.0",
+            "elm-community/random-extra": "3.2.0",
+            "elm-explorations/markdown": "1.0.0",
+            "elm-explorations/test": "2.2.0",
+            "erlandsona/assoc-set": "1.1.2",
+            "fabhof/elm-ui-datepicker": "5.0.0",
+            "justinmimbs/date": "3.2.1",
+            "lattyware/elm-fontawesome": "6.0.0",
+            "matthewsj/elm-ordering": "2.0.0",
+            "mdgriffith/elm-ui": "1.1.8",
+            "miniBill/elm-unicode": "1.1.1",
+            "myrho/elm-round": "1.0.5",
+            "pzp1997/assoc-list": "1.0.0",
+            "rtfeldman/elm-hex": "1.0.0",
+            "rtfeldman/elm-iso8601-date-strings": "1.1.4",
+            "rundis/elm-bootstrap": "5.2.0",
+            "stil4m/elm-syntax": "7.3.2",
+            "stil4m/structured-writer": "1.0.3"
+        }
     },
-    "test-dependencies": {}
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
 }
diff --git a/examples/morphir-elm-projects/evaluator-tests/package.json b/examples/morphir-elm-projects/evaluator-tests/package.json
@@ -6,6 +6,7 @@
     "morphir-elm": "^2.89.0"
   },
   "scripts": {
+    "postinstall": "elm-tooling install",
     "format": "elm-format --yes .",
     "make": "morphir-elm make"
   }