Skip to content

Commit

Permalink
Bump minimum required version to Julia 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
staticfloat committed Aug 17, 2020
1 parent 289dd1c commit edaf6b4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ language: julia
os:
- linux
julia:
- 1.3
- 1.4
- 1.5
- nightly
git:
depth: 999999
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BinaryBuilderBase"
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
authors = ["Elliot Saba <staticfloat@gmail.com>"]
version = "0.3.1"
version = "0.4.0"

[deps]
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
Expand All @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions src/Dependencies.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
6 changes: 1 addition & 5 deletions src/Prefix.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down

2 comments on commit edaf6b4

@staticfloat
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/19687

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.4.0 -m "<description of version>" edaf6b445601eab9379a2e2523d722839bbdf140
git push origin v0.4.0

Please sign in to comment.