Merge pull request #123 from rdeits/rd/update-js

update to the latest meshcat js
rdeits · Oct 10, 2019 · aea1011 · aea1011
2 parents 69c6cf4 + 08a73fb
commit aea1011
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 678 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .ipynb_checkpoints
 deps/build.log
+Manifest.toml
 
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,9 @@ matrix:
     - os: linux
       julia: 1.1
       env: TESTCMD="xvfb-run julia"
+    - os: linux
+      julia: 1.2
+      env: TESTCMD="xvfb-run julia"
     - os: linux
       julia: nightly
       env: TESTCMD="xvfb-run julia"
@@ -39,6 +42,8 @@ before_install:
 
 script:
   - julia --color=yes -e "using Pkg; if VERSION >= v\"1.1.0-rc1\"; Pkg.build(verbose=true); else Pkg.build(); end"
+  # work-around for https://github.com/JuliaWeb/MbedTLS.jl/issues/193
+  - julia --color=yes -e "using Pkg; if VERSION >= v\"1.2.0\"; Pkg.update(\"MbedTLS\"); end"
   - $TESTCMD --check-bounds=yes --color=yes -e 'using Pkg; Pkg.test("MeshCat", coverage=true)'
   - julia --color=yes -e 'using MeshCat; MeshCat.develop_meshcat_assets(true)'
   - julia --color=yes -e 'import Pkg; Pkg.build("MeshCat")'

diff --git a/Manifest.toml b/Manifest.toml
diff --git a/Project.toml b/Project.toml
@@ -26,11 +26,11 @@ WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29"
 
 [compat]
 AssetRegistry = "0.1"
-Cassette = "≥ 0.2.5"
+Cassette = "0.2.5"
 GeometryTypes = "0.6, 0.7"
 JSExpr = "0.3, 0.5"
 Mux = "0.7"
-WebIO = "0.8"
+WebIO = "0.8.11"
 julia = "0.7, 1"
 
 [extras]

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,6 +2,7 @@ environment:
   matrix:
   - julia_version: 1
   - julia_version: 1.1
+  - julia_version: 1.2
   - julia_version: nightly
 
 platform:

diff --git a/deps/build.jl b/deps/build.jl
@@ -2,7 +2,7 @@ using Base.Filesystem
 using BinDeps: unpack_cmd, download_cmd
 
 
-const meshcat_sha = "3122cecd5da022ad96bb0c8dc0f811a1bc492350"
+const meshcat_sha = "2628e6020f510ffa8fef52123e2941f7fef39428"
 const meshcat_url = "https://github.com/rdeits/meshcat/archive/$meshcat_sha.zip"
 
 const assets_dir = normpath(joinpath(@__DIR__, "..", "assets"))