Skip to content

Commit edaf6b4

Browse files
committed
Bump minimum required version to Julia 1.4
1 parent 289dd1c commit edaf6b4

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ language: julia
33
os:
44
- linux
55
julia:
6-
- 1.3
76
- 1.4
7+
- 1.5
88
- nightly
99
git:
1010
depth: 999999
@@ -37,19 +37,19 @@ jobs:
3737
- julia: nightly
3838
include:
3939
# Add a job that uses the privileged builder with squashfs shards
40-
- julia: 1.3
40+
- julia: 1.4
4141
env:
4242
- BINARYBUILDER_RUNNER=privileged
4343
- BINARYBUILDER_USE_SQUASHFS=true
4444

4545
# Add a job that uses the unprivileged builder with unpacked shards
46-
- julia: 1.3.0
46+
- julia: 1.4
4747
env:
4848
- BINARYBUILDER_RUNNER=unprivileged
4949
- BINARYBUILDER_USE_SQUASHFS=false
5050

5151
# Add a job that uses the docker builder with unpacked shards
52-
- julia: 1.3.0
52+
- julia: 1.4
5353
env:
5454
- BINARYBUILDER_RUNNER=docker
5555
- BINARYBUILDER_USE_SQUASHFS=false

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "BinaryBuilderBase"
22
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
33
authors = ["Elliot Saba <[email protected]>"]
4-
version = "0.3.1"
4+
version = "0.4.0"
55

66
[deps]
77
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
@@ -19,7 +19,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
1919
CodecZlib = "0.5, 0.6, 0.7"
2020
JSON = "0.21"
2121
OutputCollectors = "0.1"
22-
julia = "1.3"
22+
julia = "1.4"
2323

2424
[extras]
2525
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/Dependencies.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ getpkg(d::AbstractDependency) = d.pkg
4747
getname(x::PkgSpec) = x.name
4848
getname(x::AbstractDependency) = getname(getpkg(x))
4949

50-
# compatibility for Julia 1.3-
51-
if VERSION < v"1.4"
52-
Pkg.Types.registry_resolve!(ctx::Pkg.Types.Context, deps) = Pkg.Types.registry_resolve!(ctx.env, deps)
53-
end
54-
5550
# Wrapper around `Pkg.Types.registry_resolve!` which keeps the type of the
5651
# dependencies. TODO: improve this
5752
function registry_resolve!(ctx, dependencies::Vector{<:AbstractDependency})

src/Prefix.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,7 @@ function setup_dependencies(prefix::Prefix, dependencies::Vector{PkgSpec}, platf
412412

413413
# Load their Artifacts.toml files
414414
for dep in installed_jlls
415-
if VERSION >= v"1.4.0-rc2.0"
416-
dep_path = Pkg.Operations.source_path(ctx, dep)
417-
else
418-
dep_path = Pkg.Operations.source_path(dep)
419-
end
415+
dep_path = Pkg.Operations.source_path(ctx, dep)
420416
name = getname(dep)
421417

422418
# Skip dependencies that didn't get installed?

0 commit comments

Comments
 (0)