More deprecation fixes and test updates

.travis.yml

@@ -6,12 +6,24 @@ matrix:
     - os: linux
       julia: 0.6
       env: TESTCMD="xvfb-run julia"
+    - os: linux
+      julia: 0.7
+      env: TESTCMD="xvfb-run julia"
+    - os: linux
+      julia: 1.0
+      env: TESTCMD="xvfb-run julia"
     - os: linux
       julia: nightly
       env: TESTCMD="xvfb-run julia"
     - os: osx
       julia: 0.6
       env: TESTCMD="julia"
+    - os: osx
+      julia: 0.7
+      env: TESTCMD="julia"
+    - os: osx
+      julia: 1.0
+      env: TESTCMD="julia"
     - os: osx
       julia: nightly
       env: TESTCMD="julia"

REQUIRE

@@ -8,6 +8,6 @@ Mustache
 MacroTools
 Mux
 BinDeps
-Compat 0.8.6
+Compat 0.33
 WebIO
 JSExpr

appveyor.yml

@@ -1,7 +1,19 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - julia_version: 0.6
+  - julia_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# Uncomment the following lines to allow failures on nightly julia
+# (tests will run but not make your overall status red)
+matrix:
+  allow_failures:
+  - julia_version: nightly
 
 branches:
   only:
@@ -15,18 +27,18 @@ notifications:
     on_build_status_changed: false
 
 install:
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"Blink\"); Pkg.build(\"Blink\"); using Blink; Blink.AtomShell.install()"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"Blink\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# # Uncomment to support code coverage upload. Should only be enabled for packages
+# # which would have coverage gaps without running on Windows
+# on_success:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

src/AtomShell/process.jl

@@ -3,7 +3,15 @@ using Lazy, JSON, MacroTools
 hascommand(c) =
   try read(`which $c`, String); true catch e false end
 
-spawn_rdr(cmd) = run(cmd, Base.spawn_opts_inherit()...; wait=false)
+# TODO: when we drop Julia v0.6, we can remove the _spawn(args...)
+# function and just call run(args...; wait=false)
+if VERSION < v"0.7-"
+  _spawn(args...) = spawn(args...)
+else
+  _spawn(args...) = run(args...; wait=false)
+end
+
+spawn_rdr(cmd) = _spawn(cmd, Base.spawn_opts_inherit())
 
 """
   resolve_blink_asset(path...)
@@ -85,7 +93,7 @@ function init(; debug = false)
   proc = if debug
     spawn_rdr(electron_cmd)
   else
-    run(electron_cmd; wait=false)
+    _spawn(electron_cmd)
   end
   conn = try_connect(ip"127.0.0.1", p)
   shell = Electron(proc, conn)

test/AtomShell/window.jl

@@ -1,5 +1,5 @@
 using Blink
-using Base.Test
+using Compat.Test
 
 @testset "size Tests" begin
     w = Window(Blink.@d(:show => false, :width=>150, :height=>100)) ; sleep(5.0);

test/content/api.jl

@@ -1,5 +1,5 @@
 using Blink
-using Base.Test
+using Compat.Test
 
 @testset "content! Tests" begin
     w = Window(Blink.@d(:show => false)); sleep(5.0)