Dependency: isolinear -> 9014a10 (revery-ui#10)

* fix warnings * Dependency: isolinear -> 9014a10 * 9014a10 -> b17xe17 * Upgrade macOS Co-authored-by: Bryan Phelps <bryphe@outlook.com>
cometkim · Mar 24, 2020 · 0bf4bf4 · 0bf4bf4
1 parent 6b2f4e0
commit 0bf4bf4
Show file tree

Hide file tree

Showing 13 changed files with 237 additions and 230 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,7 +27,7 @@ jobs:
 - job: MacOS
   timeoutInMinutes: 0
   pool:
-    vmImage: 'macOS 10.13'
+    vmImage: 'macOS-10.14'
 
   variables:
     STAGING_DIRECTORY: /Users/runner/STAGING

diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/dune-configurator.2.3.1/opam → esy.lock/opam/dune-configurator.2.4.0/opam b/esy.lock/opam/dune-configurator.2.3.1/opam → esy.lock/opam/dune-configurator.2.4.0/opam
diff --git a/esy.lock/opam/dune-private-libs.2.3.1/opam → esy.lock/opam/dune-private-libs.2.4.0/opam b/esy.lock/opam/dune-private-libs.2.3.1/opam → esy.lock/opam/dune-private-libs.2.4.0/opam
diff --git a/esy.lock/opam/dune.2.3.1/opam → esy.lock/opam/dune.2.4.0/opam b/esy.lock/opam/dune.2.3.1/opam → esy.lock/opam/dune.2.4.0/opam
diff --git a/esy.lock/opam/lambda-term.2.0.2/opam → esy.lock/opam/lambda-term.2.0.3/opam b/esy.lock/opam/lambda-term.2.0.2/opam → esy.lock/opam/lambda-term.2.0.3/opam
diff --git a/esy.lock/opam/lwt_ppx.2.0.0/opam → esy.lock/opam/lwt_ppx.2.0.1/opam b/esy.lock/opam/lwt_ppx.2.0.0/opam → esy.lock/opam/lwt_ppx.2.0.1/opam
diff --git a/esy.lock/opam/menhirLib.20200211/opam b/esy.lock/opam/menhirLib.20200211/opam
diff --git a/esy.lock/opam/menhirSdk.20200211/opam b/esy.lock/opam/menhirSdk.20200211/opam
diff --git a/esy.lock/opam/tyxml.4.3.0/opam → esy.lock/opam/tyxml.4.4.0/opam b/esy.lock/opam/tyxml.4.3.0/opam → esy.lock/opam/tyxml.4.4.0/opam
diff --git a/package.json b/package.json
@@ -33,15 +33,15 @@
     "@glennsl/timber": "1.0.0"
   },
   "resolutions": {
-    "revery": "revery-ui/revery#4277c43",
+    "revery": "revery-ui/revery#ced2dde",
     "@esy-ocaml/libffi": "esy-ocaml/libffi#c61127d",
     "@opam/cmdliner": "1.0.2",
+    "isolinear": "revery-ui/isolinear#b17ce17",
     "esy-cmake": "prometheansacrifice/esy-cmake#2a47392def755"
   },
   "scripts": {
    "format": "esy dune build @fmt --auto-promote",
    "run": "esy x App"
-
   },
   "devDependencies": {
     "ocaml": "~4.8",

diff --git a/src/bin/Terminal.re b/src/bin/Terminal.re
@@ -98,12 +98,12 @@ module Sub = {
       type msg = outerMsg;
       type params = terminalSubParams;
 
-      let subscriptionName = "Terminal";
+      let name = "Terminal";
       type state = {
         id: int,
         unsubscribe: unit => unit,
       };
-      let getUniqueId = (params: params) => string_of_int(params.id);
+      let id = (params: params) => string_of_int(params.id);
 
       let init = (~params: params, ~dispatch) => {
         let info =

diff --git a/src/lib/Theme.re b/src/lib/Theme.re
@@ -264,4 +264,4 @@ let default =
   | 255 => rgb(238, 238, 238)
   // I don't think we'd hit a case greater than 255...
   // ...but make it obvious with magenta if we do.
-  | _idx => rgb(255, 0, 255);
+  | _ => rgb(255, 0, 255);