diff --git a/.travis.yml b/.travis.yml index 67cac4c..6970931 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ git: # uncomment the following lines to override the default test script script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia -e 'if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(pwd()); else; using Pkg; Pkg.up(); end; Pkg.test("StrFormat"; coverage=true)' + - julia -e 'if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(pwd()); else; using Pkg; Pkg.up(); l=("ChrBase", "StrBase", "StrLiterals"); for n in l; Pkg.rm(n); end; Pkg.add(["https://github.com/JuliaString/$n.jl" for n in l]); Pkg.add(pwd()); end; Pkg.test("StrFormat"; coverage=true)' after_success: # push coverage results to Coveralls - - julia -e 'cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' + - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' # push coverage results to Codecov - - julia -e 'cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' + - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' diff --git a/Project.toml b/Project.save similarity index 100% rename from Project.toml rename to Project.save diff --git a/REQUIRE b/REQUIRE index 35e7511..b74487c 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,3 +1,9 @@ julia 0.6 -Format -StrLiterals +Format 0.6.4 +ModuleInterfaceTools 0.1.2 +StrAPI 0.1.1 +CharSetEncodings 0.1.1 +ChrBase 0.1.1 +MurmurHash3 0.1.2 +StrBase 0.1.1 +StrLiterals 0.1.0 diff --git a/appveyor.yml b/appveyor.yml index 36b0a3b..8131ddb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,12 @@ build_script: - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils); versioninfo(); if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), \"StrFormat\"); - else; using Pkg; Pkg.up(); end" + else; using Pkg; Pkg.up(); + l = ("ChrBase", "StrBase", "StrLiterals"); + for n in l; Pkg.rm(n); end; + Pkg.add(["https://github.com/JuliaString/$n.jl" for n in l]); + Pkg.add(pwd()); + end" test_script: - - C:\projects\julia\bin\julia -e "Pkg.test(\"StrFormat\")" + - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); Pkg.test(\"StrFormat\")" diff --git a/test/runtests.jl b/test/runtests.jl index 8ea8cda..b68f13e 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2,6 +2,8 @@ using ModuleInterfaceTools, Format +@static V6_COMPAT || (using Pkg) + @api test StrAPI, StrLiterals using StrFormat