diff --git a/Project.toml b/Project.toml index 3dcc58db..5d1afc2e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "BinaryBuilder" uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae" authors = ["Elliot Saba "] -version = "0.6.1" +version = "0.6.2" [deps] ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" diff --git a/src/AutoBuild.jl b/src/AutoBuild.jl index 270cf108..320bcb25 100644 --- a/src/AutoBuild.jl +++ b/src/AutoBuild.jl @@ -7,7 +7,7 @@ import LibGit2 import PkgLicenses const DEFAULT_JULIA_VERSION_SPEC = "1.0" -const DEFAULT_JLLWRAPPERS_VERSION_SPEC = "1.2.0" +const DEFAULT_JLLWRAPPERS_VERSION_SPEC = "1.7.0" const PKG_VERSIONS = Base.VERSION >= v"1.7-" ? Pkg.Versions : Pkg.Types mutable struct BuildTimer @@ -597,7 +597,7 @@ function register_jll(name, build_version, dependencies, julia_compat; cache = RegistryTools.RegistryCache(joinpath(Pkg.depots1(), "registries_binarybuilder")) registry_url = "https://$(gh_username):$(gh_auth.token)@github.com/JuliaRegistries/General" cache.registries[registry_url] = Base.UUID("23338594-aafe-5451-b93e-139f81909106") - jllwrappers_compat = isempty(augment_platform_block) ? DEFAULT_JLLWRAPPERS_VERSION_SPEC : "1.4.0" + jllwrappers_compat = DEFAULT_JLLWRAPPERS_VERSION_SPEC project = Pkg.Types.Project(build_project_dict(name, build_version, dependencies, julia_compat; jllwrappers_compat, lazy_artifacts, augment_platform_block)) project_file = joinpath(mktempdir(), "Project.toml") Pkg.Types.write_project(project, project_file) diff --git a/test/basic.jl b/test/basic.jl index d289fdaf..5f1e60eb 100644 --- a/test/basic.jl +++ b/test/basic.jl @@ -199,7 +199,7 @@ end @test dict["name"] == "$(name)_jll" @test dict["version"] == "1.0.0" @test dict["uuid"] == "8fcd9439-76b0-55f4-a525-bad0597c05d8" - @test dict["compat"] == Dict{String,Any}("julia" => "1.0", "JLLWrappers" => "1.2.0", "Pkg" => "< 0.0.1, 1", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1") + @test dict["compat"] == Dict{String,Any}("julia" => "1.0", "JLLWrappers" => "1.7.0", "Pkg" => "< 0.0.1, 1", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1") @test all(in.( ( "Pkg" => "44cfe95a-1eb2-52ea-b672-e2afdf69b78f", @@ -224,10 +224,10 @@ end # Ensure passing a Julia dependency bound works dict = build_project_dict(name, version, dependencies, "1.4") - @test dict["compat"] == Dict{String,Any}("julia" => "1.4", "JLLWrappers" => "1.2.0", "Pkg" => "< 0.0.1, 1", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1") + @test dict["compat"] == Dict{String,Any}("julia" => "1.4", "JLLWrappers" => "1.7.0", "Pkg" => "< 0.0.1, 1", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1") dict = build_project_dict(name, version, dependencies, "~1.4") - @test dict["compat"] == Dict{String,Any}("julia" => "~1.4", "JLLWrappers" => "1.2.0", "Pkg" => "< 0.0.1, 1", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1") + @test dict["compat"] == Dict{String,Any}("julia" => "~1.4", "JLLWrappers" => "1.7.0", "Pkg" => "< 0.0.1, 1", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1") @test_throws ErrorException build_project_dict(name, version, dependencies, "nonsense") diff --git a/test/jll.jl b/test/jll.jl index 035f7797..711c43e4 100644 --- a/test/jll.jl +++ b/test/jll.jl @@ -28,7 +28,7 @@ module TestJLL end @test project["compat"] == Dict( "julia" => "1.0", "XZ_jll" => "=2.4.6", - "JLLWrappers" => "1.2.0", + "JLLWrappers" => "1.7.0", "Libdl" => "< 0.0.1, 1", "Artifacts" => "< 0.0.1, 1", "Pkg" => "< 0.0.1, 1",