Remove 0.4 support, and related cleanup

Author: aviks

REQUIRE

@@ -1,4 +1,3 @@
-julia 0.4
-Compat 0.9.5
+julia 0.5
 DataStructures
 @windows WinReg

src/JavaCall.jl

@@ -6,28 +6,16 @@ export JavaObject, JavaMetaClass,
        getname, listmethods, getreturntype, getparametertypes
 
 using Base.Dates
-using Compat
-import Compat.String
+
 import DataStructures: OrderedSet
 
 @static if is_windows()
     using WinReg
 end
 
 
-import Base.convert, Base.isnull, Base.unsafe_convert
-
-# if VERSION < v"0.5.0-dev+4612"
-# 	const unsafe_string = Base.bytestring
-# else
-# 	const unsafe_string = Base.unsafe_string
-# end
+import Base.convert, Base.isnull, Base.unsafe_convert, Base.unsafe_string
 
-if VERSION < v"0.5.0-dev+4612"
-    import Compat.unsafe_string
-else
-    import Base.unsafe_string
-end
 
 include("jnienv.jl")
 include("jvm.jl")

src/convert.jl

@@ -106,7 +106,7 @@ for (x, y, z) in [ (:jboolean, :(jnifunc.GetBooleanArrayElements), :(jnifunc.Rel
         function convert_result(rettype::Type{Array{$(x),1}}, result)
             sz = ccall(jnifunc.GetArrayLength, jint, (Ptr{JNIEnv}, Ptr{Void}), penv, result)
             arr = ccall($(y), Ptr{$(x)}, (Ptr{JNIEnv}, Ptr{Void}, Ptr{jboolean} ), penv, result, C_NULL )
-            jl_arr::Array = unsafe_wrap(Array, arr, (@compat Int(sz)), false)
+            jl_arr::Array = unsafe_wrap(Array, arr, Int(sz), false)
             jl_arr = deepcopy(jl_arr)
             ccall($(z), Void, (Ptr{JNIEnv},Ptr{Void}, Ptr{$(x)}, jint), penv, result, arr, 0)
             return jl_arr
@@ -183,20 +183,6 @@ function unsafe_string(jstr::JString)  #jstr must be a jstring obtained via a JN
     return s
 end
 
-#This is necessary to properly deprecate bytestring in 0.5, while ensuring
-# callers don't need to change for 0.4.
-if VERSION <= v"0.5.0"
-    function Base.bytestring(jstr::JString)  #jstr must be a jstring obtained via a JNI call
-        if VERSION >= v"0.5.0-dev+4612"
-            Base.depwarn("bytestring(jstr::JString) is deprecated. Use unsafe_string(jstr) instead", :bytestring )
-        end
-        return JavaCall.unsafe_string(jstr)
-    end
-end
-
-
-
-
 for (x, y, z) in [ (:jboolean, :(jnifunc.GetBooleanArrayElements), :(jnifunc.ReleaseBooleanArrayElements)),
                   (:jchar, :(jnifunc.GetCharArrayElements), :(jnifunc.ReleaseCharArrayElements)),
                   (:jbyte, :(jnifunc.GetByteArrayElements), :(jnifunc.ReleaseByteArrayElements)),
@@ -209,7 +195,7 @@ for (x, y, z) in [ (:jboolean, :(jnifunc.GetBooleanArrayElements), :(jnifunc.Rel
         function convert(::Type{Array{$(x),1}}, obj::JObject)
             sz = ccall(jnifunc.GetArrayLength, jint, (Ptr{JNIEnv}, Ptr{Void}), penv, obj.ptr)
             arr = ccall($(y), Ptr{$(x)}, (Ptr{JNIEnv}, Ptr{Void}, Ptr{jboolean} ), penv, obj.ptr, C_NULL )
-            jl_arr::Array = unsafe_wrap(Array, arr, (@compat Int(sz)), false)
+            jl_arr::Array = unsafe_wrap(Array, arr, Int(sz), false)
             jl_arr = deepcopy(jl_arr)
             ccall($(z), Void, (Ptr{JNIEnv},Ptr{Void}, Ptr{$(x)}, jint), penv, obj.ptr, arr, 0)
             return jl_arr

src/core.jl

@@ -14,7 +14,7 @@ const jshort = Cshort
 const jfloat = Cfloat
 const jdouble = Cdouble
 const jsize = jint
-jprimitive = @compat Union{jboolean, jchar, jshort, jfloat, jdouble, jint, jlong}
+jprimitive = Union{jboolean, jchar, jshort, jfloat, jdouble, jint, jlong}
 
 immutable JavaMetaClass{T}
     ptr::Ptr{Void}
@@ -94,10 +94,10 @@ function JString(str::AbstractString)
 end
 
 # jvalue(v::Integer) = int64(v) << (64-8*sizeof(v))
-jvalue(v::Integer) = @compat Int64(v)
+jvalue(v::Integer) = Int64(v)
 jvalue(v::Float32) = jvalue(reinterpret(Int32, v))
 jvalue(v::Float64) = jvalue(reinterpret(Int64, v))
-jvalue(v::Ptr) = jvalue(@compat Int(v))
+jvalue(v::Ptr) = jvalue(Int(v))
 
 
 

src/reflect.jl

@@ -4,7 +4,7 @@ function getclass(obj::JavaObject)
 end
 
 function conventional_name(name::AbstractString)
-    if @compat startswith(name, "[")
+    if startswith(name, "[")
         return conventional_name(name[2:end]) * "[]"
     elseif name == "Z"
         return "boolean"
@@ -22,7 +22,7 @@ function conventional_name(name::AbstractString)
         return "double"
     elseif name == "V"
         return "void"
-    elseif @compat startswith(name, "L")
+    elseif startswith(name, "L")
         return name[2:end-1]
     else
         return name
@@ -123,7 +123,7 @@ Returns the parameter types of the java method
 * method: The java method object
 
 ### Returns
-Vector the parametertypes 
+Vector the parametertypes
 """
 function getparametertypes(method::JMethod)
     jcall(method, "getParameterTypes", Vector{JClass}, ())
@@ -136,4 +136,3 @@ function Base.show(io::IO, method::JMethod)
     argtypestr = join(argtypes, ", ")
     print(io, "$rettype $name($argtypestr)")
 end
-