From ce4366cbede7c56e8777d5251733c4454bdf9521 Mon Sep 17 00:00:00 2001 From: Jonathan Bieler Date: Sun, 10 Feb 2019 15:12:07 +0100 Subject: [PATCH] cleaned old version support --- .travis.yml | 4 ++-- REQUIRE | 3 ++- src/Immerse.jl | 8 +------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3e56d6..a911589 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: julia sudo: required os: - linux + - osx julia: - - 0.7 - 1.0 - nightly matrix: @@ -27,4 +27,4 @@ script: julia --check-bounds=yes -e 'using Pkg; Pkg.test("Immerse", coverage=true)'; fi after_success: - - julia -e 'using Pkg; cd(Pkg.dir("Immerse")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'; \ No newline at end of file + - julia -e 'using Pkg; cd(Pkg.dir("Immerse")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'; diff --git a/REQUIRE b/REQUIRE index 32ff261..b2c2f49 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,9 +1,10 @@ julia 0.7 DataFrames Gadfly -Compose +Compose Measures Compat +Graphics Colors Gtk GtkUtilities diff --git a/src/Immerse.jl b/src/Immerse.jl index 43e816a..856c461 100644 --- a/src/Immerse.jl +++ b/src/Immerse.jl @@ -2,7 +2,7 @@ __precompile__() module Immerse -using GtkUtilities, Colors, Reexport, Compat, REPL +using GtkUtilities, Colors, Reexport, Compat, REPL, Graphics @reexport using Gadfly import Gtk # because both Gadfly and Gtk define draw import Compose, Measures @@ -11,12 +11,6 @@ using Cairo @eval Compose begin import Cairo end Compose.link_cairo() -if VERSION < v"0.4.0-dev" - using Base.Graphics -else - using Graphics -end - export Figure, closefig,