Merge pull request #80 from JuliaInterop/julia-1.0

Julia 1.0

Author: aviks

.gitignore

@@ -1,3 +1,4 @@
 *~
 .juliahistory
-.DS_Store
+.DS_Store
+Manifest.toml

.travis.yml

@@ -2,7 +2,13 @@ language: julia
 os:
   - linux
 julia:
-  - 0.6
   - 0.7
+  - 1.0
+  - nightly
+
+matrix:
+  allow_failures:
+    - julia_version: nightly
+
 notifications:
   email: false

REQUIRE

@@ -1,4 +1,3 @@
-julia 0.6
+julia 0.7
 DataStructures
-Compat 0.65
 @windows WinReg

appveyor.yml

@@ -1,18 +1,18 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-    JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0\
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-    JAVA_HOME: C:\Program Files\Java\jdk1.7.0\
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-    JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0\
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
-    JAVA_HOME: C:\Program Files\Java\jdk1.7.0\
+  - julia_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
 
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# # Uncomment the following lines to allow failures on nightly julia
+# # (tests will run but not make your overall status red)
 matrix:
   allow_failures:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-    - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+  - julia_version: nightly
 
 branches:
   only:
@@ -26,19 +26,18 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"JavaCall\"); Pkg.build(\"JavaCall\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"JavaCall\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# # Uncomment to support code coverage upload. Should only be enabled for packages
+# # which would have coverage gaps without running on Windows
+# on_success:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

doc/methods.md

@@ -74,7 +74,7 @@ Calling instance methods uses the `jcall` function, with an instance of the `Jav
 ```julia
 jcall(gurl, "getHost", JString,()) #"wwww.google.com"
 innerObj=jcall(outerObj, "createrInnerObject", jinner,())
-jcall(innerObj, "innerMethod", Void,()) #Prints "In Inner class Method"
+jcall(innerObj, "innerMethod", Nothing,()) #Prints "In Inner class Method"
 ```
 
 ##Calling Array Methods

src/JavaCall.jl

@@ -6,21 +6,15 @@ export JavaObject, JavaMetaClass,
        getname, getclass, listmethods, getreturntype, getparametertypes, classforname,
        narrow
 
-using Compat, Compat.Dates
+# using Compat, Compat.Dates
 
-using Compat.Sys: iswindows, islinux, isunix, isapple
+# using Sys: iswindows, islinux, isunix, isapple
 
 import DataStructures: OrderedSet
+import Libdl
+using Dates
 
-if VERSION < v"0.7-"
-    using Compat: @warn
-    import Base: isnull
-    Base.finalizer(f::Function, o) = Base.finalizer(o, f)
-else
-    using Libdl
-end
-
-@static if iswindows()
+@static if Sys.iswindows()
     using WinReg
 end
 

src/convert.jl

@@ -30,7 +30,7 @@ unsafe_convert(::Type{Ptr{Nothing}}, cls::JavaMetaClass) = cls.ptr
 
 # Get the JNI/C type for a particular Java type
 function real_jtype(rettype)
-    if issubtype(rettype, JavaObject) || issubtype(rettype, Array) || issubtype(rettype, JavaMetaClass)
+    if rettype <: JavaObject || rettype <: Array || rettype <: JavaMetaClass
         jnitype = Ptr{Nothing}
     else
         jnitype = rettype
@@ -324,10 +324,13 @@ function narrow(obj::JavaObject)
     return convert(JavaObject{Symbol(t)}, obj)
 end
 
-# TODO replace once iterate is available in Compat
-Base.start(itr::JavaObject) = true
-function Base.next(itr::JavaObject, state)
-     o = jcall(itr, "next", @jimport(java.lang.Object), ())
-     return (narrow(o), state)
+has_next(itr::JavaObject) = (jcall(itr, "hasNext", jboolean, ()) == JNI_TRUE)
+
+function Base.iterate(itr::JavaObject, state=nothing)
+    if has_next(itr)
+        o = jcall(itr, "next", @jimport(java.lang.Object), ())
+        return (narrow(o), state)
+    else
+        return nothing
+    end
 end
-Base.done(itr::JavaObject, state)  = (jcall(itr, "hasNext", jboolean, ()) == JNI_FALSE)

src/jvm.jl

@@ -34,7 +34,7 @@ function javahome_winreg()
     end
 end
 
-@static isunix() ? (global const libname = "libjvm") : (global const libname = "jvm")
+@static Sys.isunix() ? (global const libname = "libjvm") : (global const libname = "jvm")
 
 function findjvm()
     javahomes = Any[]
@@ -43,12 +43,12 @@ function findjvm()
     if haskey(ENV,"JAVA_HOME")
         push!(javahomes,ENV["JAVA_HOME"])
     else
-        @static iswindows() ? ENV["JAVA_HOME"] = javahome_winreg() : nothing
-        @static iswindows() ? push!(javahomes, ENV["JAVA_HOME"]) : nothing
+        @static Sys.iswindows() ? ENV["JAVA_HOME"] = javahome_winreg() : nothing
+        @static Sys.iswindows() ? push!(javahomes, ENV["JAVA_HOME"]) : nothing
     end
 
     if isfile("/usr/libexec/java_home")
-        push!(javahomes,chomp(readstring(`/usr/libexec/java_home`)))
+        push!(javahomes,chomp(read(`/usr/libexec/java_home`, String)))
     end
 
     if isdir("/usr/lib/jvm/default-java/")
@@ -57,12 +57,12 @@ function findjvm()
 
     push!(libpaths, pwd())
     for n in javahomes
-        @static if iswindows()
+        @static if Sys.iswindows()
             push!(libpaths, joinpath(n, "bin", "server"))
             push!(libpaths, joinpath(n, "jre", "bin", "server"))
             push!(libpaths, joinpath(n, "bin", "client"))
         end
-        @static if islinux()
+        @static if Sys.islinux()
             if Sys.WORD_SIZE==64
                 push!(libpaths, joinpath(n, "jre", "lib", "amd64", "server"))
                 push!(libpaths, joinpath(n, "lib", "amd64", "server"))
@@ -76,16 +76,16 @@ function findjvm()
         push!(libpaths, joinpath(n, "lib", "server"))
     end
 
-    ext = @static iswindows() ? "dll" : (@static isapple() ? "dylib" : "so")
+    ext = @static Sys.iswindows() ? "dll" : (@static Sys.isapple() ? "dylib" : "so")
     ext = "."*ext
 
     try
         for n in libpaths
             libpath = joinpath(n,libname*ext);
             if isfile(libpath)
-                if iswindows()
+                if Sys.iswindows()
                     bindir = dirname(dirname(libpath))
-                    m = filter(x -> ismatch(r"msvcr(?:.*).dll",x), readdir(bindir))
+                    m = filter(x -> occursin(r"msvcr(?:.*).dll",x), readdir(bindir))
                     Libdl.dlopen(joinpath(bindir,m[1]))
                 end
                 global libjvm = Libdl.dlopen(libpath)
@@ -124,14 +124,14 @@ struct JavaVMInitArgs
 end
 
 
-@static isunix() ? (const sep = ":") : nothing
-@static iswindows() ? (const sep = ";") : nothing
+@static Sys.isunix() ? (const sep = ":") : nothing
+@static Sys.iswindows() ? (const sep = ";") : nothing
 cp = OrderedSet{String}()
 opts = OrderedSet{String}()
 
 function addClassPath(s::String)
     if isloaded()
-        warn("JVM already initialised. This call has no effect")
+        @warn("JVM already initialised. This call has no effect")
         return
     end
     if s==""; return; end

test/runtests.jl

@@ -1,11 +1,8 @@
-using Compat, Compat.Test
+using Test
 using JavaCall
 
-if VERSION ≥ v"0.7-"
-    import Pkg
-    import Dates
-    using Base.GC: gc
-end
+import Dates
+using Base.GC: gc
 
 
 JavaCall.init(["-Djava.class.path=$(@__DIR__)"])
@@ -33,8 +30,8 @@ T = @jimport Test
     @test "Hello Java"==jcall(T, "testString", JString, (JString,), "Hello Java")
     @test Float64(10.02) == jcall(T, "testDouble", jdouble, (jdouble,), 10.02) #Comparing exact float representations hence ==
     @test Float32(10.02) == jcall(T, "testFloat", jfloat, (jfloat,), 10.02)
-    @test realmax(jdouble) == jcall(T, "testDouble", jdouble, (jdouble,), realmax(jdouble))
-    @test realmax(jfloat) == jcall(T, "testFloat", jfloat, (jfloat,), realmax(jfloat))
+    @test floatmax(jdouble) == jcall(T, "testDouble", jdouble, (jdouble,), floatmax(jdouble))
+    @test floatmax(jfloat) == jcall(T, "testFloat", jfloat, (jfloat,), floatmax(jfloat))
     c=JString(C_NULL)
     @test isnull(c)
     @test "" == jcall(T, "testString", JString, (JString,), c)
@@ -123,9 +120,9 @@ end
 
 @testset "inner_classes_1" begin
     TestInner = @jimport(Test$TestInner)
-    Test = @jimport(Test)
-    t=Test(())
-    inner = TestInner((Test,), t)
+    JTest = @jimport(Test)
+    t=JTest(())
+    inner = TestInner((JTest,), t)
     @test jcall(inner, "innerString", JString, ()) == "from inner"
     @test jfield(@jimport(java.lang.Math), "E", jdouble) == 2.718281828459045
     @test jfield(@jimport(java.lang.Math), "PI", jdouble) == 3.141592653589793