Skip to content

Commit

Permalink
Merge pull request #20 from ararslan/aa/jll
Browse files Browse the repository at this point in the history
Use Zstd_jll to provide zstd, update to 1.4.4
  • Loading branch information
ararslan authored Mar 16, 2020
2 parents e56b7bc + b2ef351 commit 39470d1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 78 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ os:
- linux
- osx
julia:
- 1.0
- 1.1
- 1.3
- nightly
matrix:
allow_failures:
Expand Down
9 changes: 4 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ name = "CodecZstd"
uuid = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
license = "MIT"
authors = ["Kenta Sato <bicycle1885@gmail.com>"]
version = "0.6.1"
version = "0.7.0"

[deps]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"

[compat]
BinaryProvider = "0.5"
TranscodingStreams = "0.9"
julia = "1"
Zstd_jll = "1.4"
julia = "1.3"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
environment:
matrix:
- julia_version: 1.0
- julia_version: 1.1
- julia_version: 1.3
- julia_version: nightly

platform:
Expand Down
62 changes: 0 additions & 62 deletions deps/build.jl

This file was deleted.

8 changes: 1 addition & 7 deletions src/CodecZstd.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@ import TranscodingStreams:
finalize,
splitkwargs

using Libdl
const libzpath = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
if !isfile(libzpath)
error("CodecZstd.jl is not installed properly, run Pkg.build(\"CodecZstd\") and restart Julia.")
end
include(libzpath)
check_deps()
using Zstd_jll

include("libzstd.jl")
include("compression.jl")
Expand Down

2 comments on commit 39470d1

@ararslan
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/11059

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 Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.7.0 -m "<description of version>" 39470d1cd79a1ae80ee7b6257d0b66cb3cc23940
git push origin v0.7.0

Please sign in to comment.