Skip to content

Commit cc7456f

Browse files
committed
Support Julia 0.7, drop 0.6 and LegacyStrings
1 parent 17d7c89 commit cc7456f

File tree

7 files changed

+95
-143
lines changed

7 files changed

+95
-143
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ os:
44
- linux
55
- osx
66
julia:
7-
- 0.6
87
- 0.7
98
- nightly
109
notifications:

README.md

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# StringEncodings
22

3-
[![Travis CI Build Status](https://travis-ci.org/nalimilan/StringEncodings.jl.svg?branch=master)](https://travis-ci.org/nalimilan/StringEncodings.jl)
3+
[![Travis CI Build Status](https://travis-ci.org/JuliaStrings/StringEncodings.jl.svg?branch=master)](https://travis-ci.org/JuliaStrings/StringEncodings.jl)
44
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/3gslhfg91isldnvq?svg=true)](https://ci.appveyor.com/project/nalimilan/stringencodings-jl)
5-
[![Coveralls Coverage Status](https://coveralls.io/repos/nalimilan/StringEncodings.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/nalimilan/StringEncodings.jl?branch=master)
6-
[![Codecov Coverage Status](http://codecov.io/github/nalimilan/StringEncodings.jl/coverage.svg?branch=master)](http://codecov.io/github/nalimilan/StringEncodings.jl?branch=master)
5+
[![Coveralls Coverage Status](https://coveralls.io/repos/JuliaStrings/StringEncodings.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaStrings/StringEncodings.jl?branch=master)
6+
[![Codecov Coverage Status](http://codecov.io/github/JuliaStrings/StringEncodings.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaStrings/StringEncodings.jl?branch=master)
77

8-
[![Julia 0.6 Status](http://pkg.julialang.org/badges/StringEncodings_0.6.svg)](http://pkg.julialang.org/?pkg=StringEncodings&ver=0.6)
98
[![Julia 0.7 Status](http://pkg.julialang.org/badges/StringEncodings_0.7.svg)](http://pkg.julialang.org/?pkg=StringEncodings&ver=0.7)
109

1110
This Julia package provides support for decoding and encoding texts between multiple character encodings. It is currently based on the iconv interface, and supports all major platforms using either the native iconv support or [GNU libiconv](https://www.gnu.org/software/libiconv/). In the future, native Julia support for major encodings will be added.
@@ -82,12 +81,12 @@ julia> write(f, "café\nnoël")
8281
julia> close(f); # Essential to complete encoding
8382
```
8483

85-
The contents of the file can then be read back using `readstring`:
84+
The contents of the file can then be read back using `read(path, String)`:
8685
```julia
87-
julia> readstring(path) # Standard function expects UTF-8
86+
julia> read(path, String) # Standard function expects UTF-8
8887
"\U3d83f7c0f\0\0n\0o\0\0"
8988

90-
julia> readstring(path, enc"UTF-16") # Works when passing the correct encoding
89+
julia> read(path, String, enc"UTF-16") # Works when passing the correct encoding
9190
"café\nnoël"
9291
```
9392

@@ -115,7 +114,7 @@ When performing more complex operations on an encoded text file, it will often b
115114
```julia
116115
julia> io = open(path, enc"UTF-16");
117116

118-
julia> readstring(io)
117+
julia> read(io, String)
119118
"café\nnoël"
120119
```
121120

@@ -142,7 +141,7 @@ julia> seek(b, 0); # Move to start of buffer
142141

143142
julia> s = StringDecoder(b, "UTF-16");
144143

145-
julia> readstring(s) # Decoding happens automatically here
144+
julia> read(s, String) # Decoding happens automatically here
146145
"café"
147146
```
148147

REQUIRE

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
julia 0.6
2-
BinaryProvider 0.3.0
3-
Compat 0.17.0
4-
LegacyStrings 0.1.1
1+
julia 0.7
2+
BinaryProvider 0.3.0

appveyor.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
53
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
64
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
75
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"

0 commit comments

Comments
 (0)