diff --git a/.travis.yml b/.travis.yml index bcfc9423..c37e7a90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ language: julia os: - linux julia: - - 1.3 - 1.4 + - 1.5 - nightly git: depth: 999999 @@ -37,19 +37,19 @@ jobs: - julia: nightly include: # Add a job that uses the privileged builder with squashfs shards - - julia: 1.3 + - julia: 1.4 env: - BINARYBUILDER_RUNNER=privileged - BINARYBUILDER_USE_SQUASHFS=true # Add a job that uses the unprivileged builder with unpacked shards - - julia: 1.3.0 + - julia: 1.4 env: - BINARYBUILDER_RUNNER=unprivileged - BINARYBUILDER_USE_SQUASHFS=false # Add a job that uses the docker builder with unpacked shards - - julia: 1.3.0 + - julia: 1.4 env: - BINARYBUILDER_RUNNER=docker - BINARYBUILDER_USE_SQUASHFS=false diff --git a/Project.toml b/Project.toml index c4d5a9e1..05081265 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "BinaryBuilderBase" uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e" authors = ["Elliot Saba "] -version = "0.3.1" +version = "0.4.0" [deps] CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193" @@ -19,7 +19,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" CodecZlib = "0.5, 0.6, 0.7" JSON = "0.21" OutputCollectors = "0.1" -julia = "1.3" +julia = "1.4" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/src/Dependencies.jl b/src/Dependencies.jl index 0f0a927e..b070fdb8 100644 --- a/src/Dependencies.jl +++ b/src/Dependencies.jl @@ -47,11 +47,6 @@ getpkg(d::AbstractDependency) = d.pkg getname(x::PkgSpec) = x.name getname(x::AbstractDependency) = getname(getpkg(x)) -# compatibility for Julia 1.3- -if VERSION < v"1.4" - Pkg.Types.registry_resolve!(ctx::Pkg.Types.Context, deps) = Pkg.Types.registry_resolve!(ctx.env, deps) -end - # Wrapper around `Pkg.Types.registry_resolve!` which keeps the type of the # dependencies. TODO: improve this function registry_resolve!(ctx, dependencies::Vector{<:AbstractDependency}) diff --git a/src/Prefix.jl b/src/Prefix.jl index 28f05ec4..33caa6b4 100644 --- a/src/Prefix.jl +++ b/src/Prefix.jl @@ -412,11 +412,7 @@ function setup_dependencies(prefix::Prefix, dependencies::Vector{PkgSpec}, platf # Load their Artifacts.toml files for dep in installed_jlls - if VERSION >= v"1.4.0-rc2.0" - dep_path = Pkg.Operations.source_path(ctx, dep) - else - dep_path = Pkg.Operations.source_path(dep) - end + dep_path = Pkg.Operations.source_path(ctx, dep) name = getname(dep) # Skip dependencies that didn't get installed?