Windows build

.gitignore

@@ -8,3 +8,5 @@ build/*
 .project
 .settings
 bin/
+/.gradle/
+/build/

.travis.yml

@@ -39,7 +39,7 @@ install:
 
 script:
   - ./gradlew checkFormat
-  - ./gradlew test
+  - ./gradlew --info test
 
 # Upload to sonatype oss for master snapshots
 after_success:

CMakeLists.txt

@@ -88,6 +88,7 @@ add_library(tiledbjni SHARED
     src/main/c/custom/tiledb_custom.cxx
 )
 
+target_compile_definitions(tiledbjni PRIVATE -DTILEDB_CORE_OBJECTS_EXPORTS)
 target_include_directories(tiledbjni
   PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}/swig"

appveyor.yml

@@ -0,0 +1,19 @@
+version: 0.2.7.{build}
+
+image: Visual Studio 2019
+platform:
+  - x64
+
+build: off
+
+build_script:
+  - gradlew assemble
+
+test_script:
+  - gradlew --info test
+# Check that the NativeLibLoader functions correctly
+  - ps: $(ls build\libs\tiledb-java-*.jar | % {$Env:CLASSPATH += $_.FullName + ";"})
+  - ps: java examples.io.tiledb.java.api.TileDBVersion
+
+artifacts:
+  - path: 'build\libs\*'

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-   id 'java'
+   id 'java-library'
    id 'idea'
    id 'maven-publish'
    id 'signing'
@@ -41,90 +41,85 @@ sourceSets {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testImplementation 'junit:junit:4.12'
 }
 
-def String getProjectProperty(String propertyName)
-{
-    String property = null
-    if (hasProperty(propertyName))
-    {
-        property = this.properties[propertyName]
+task cmakeTask(type: Exec) {
+    doFirst {
+        mkdir buildDir
     }
-    return property
-}
 
-task cmakeTask(type: Exec) {
     workingDir = buildDir
     executable = 'cmake'
-    List<String> buildArgs = new ArrayList<String>()
-    buildArgs.add("..")
-    String tiledb_git_repo = getProjectProperty('TILEDB_GIT_REPOSITORY')
-    String tiledb_git_tag = getProjectProperty('TILEDB_GIT_TAG')
-    String tiledb_verbose = getProjectProperty('TILEDB_VERBOSE')
-    String tiledb_s3 = getProjectProperty('TILEDB_S3')
-    String tiledb_hdfs = getProjectProperty('TILEDB_HDFS')
-    String tiledb_serialization = getProjectProperty('TILEDB_SERIALIZATION')
-    if (tiledb_git_repo != null) {
-	    buildArgs.add("-DTILEDB_GIT_REPOSITORY=" + tiledb_git_repo)
-    }
-    if (tiledb_git_tag != null) {
-        buildArgs.add("-DTILEDB_GIT_TAG=" + tiledb_git_tag)
-    }
-    if (tiledb_verbose != null) {
-        buildArgs.add("-DTILEDB_VERBOSE=" + tiledb_verbose)
-    }
-    if (tiledb_s3 != null) {
-        buildArgs.add("-DTILEDB_S3=" + tiledb_s3)
-    }
-    if (tiledb_hdfs != null) {
-        buildArgs.add("-DTILEDB_HDFS=" + tiledb_hdfs)
-    }
-    if (tiledb_serialization != null) {
-        buildArgs.add("-DTILEDB_SERIALIZATION=" + tiledb_serialization)
+    def buildArgs = [".."]
+    if (project.properties.TILEDB_CMAKE_GENERATOR) {
+        buildArgs << "-G" << project.properties.TILEDB_CMAKE_GENERATOR
+    }
+    if (project.properties.TILEDB_CMAKE_ARCHITECTURE) {
+        buildArgs << "-A" << project.properties.TILEDB_CMAKE_ARCHITECTURE
+    }
+    [
+        "TILEDB_GIT_REPOSITORY",
+        "TILEDB_GIT_TAG",
+        "TILEDB_VERBOSE",
+        "TILEDB_S3",
+        "TILEDB_HDFS",
+        "TILEDB_SERIALIZATION"
+    ].each { v ->
+        if (project.hasProperty(v)) {
+            buildArgs << "-D${v}=${project.property(v)}"
+        }
     }
     args buildArgs
 }
 
-task makeTask(type: Exec) {
+task cmakeBuildTask(type: Exec) {
     workingDir = buildDir
-    executable = 'make'
-    args "-j${Runtime.getRuntime().availableProcessors()}"
-}
-makeTask.dependsOn(cmakeTask)
-
-task makeInstallTask(type: Exec) {
-    workingDir = new File(buildDir, "tiledb_jni")
-    executable = 'make'
-    args 'install'
+    executable = 'cmake'
+    args "--build", ".", "--config", "release"
 }
-makeInstallTask.dependsOn(makeTask)
+cmakeBuildTask.dependsOn(cmakeTask)
 
-assemble.dependsOn(makeInstallTask)
+assemble.dependsOn(cmakeBuildTask)
 
 task generateJNI(type: Exec) {
     workingDir = buildDir
     executable = "../generate_tiledb_jni"
 }
 
+import org.apache.tools.ant.taskdefs.condition.Os
 test {
-    systemProperty "java.library.path", "$buildDir/install/lib/"
+    useJUnit()
+
+    maxHeapSize = '1G'
+
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        systemProperty "java.library.path", "$buildDir\\install\\bin;$buildDir\\tiledb_jni\\Release"
+    } else {
+        systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni"
+    }
+
     testLogging {
         showStandardStreams = true
     }
 }
 
 jar {
     into(new File('lib', osdetector.classifier).toString()) {
+        // Linux and macOS
         from file("$buildDir/install/lib/${System.mapLibraryName("tiledb")}")
-        from file("$buildDir/install/lib/${System.mapLibraryName("tiledbjni")}")
         from file("$buildDir/install/lib64/${System.mapLibraryName("tiledb")}")
-        from file("$buildDir/install/lib64/${System.mapLibraryName("tiledbjni")}")
+        from file("$buildDir/tiledb_jni/${System.mapLibraryName("tiledbjni")}")
+        // Windows
+        from file("$buildDir/install/bin/${System.mapLibraryName("tbb")}")
+        from file("$buildDir/install/bin/${System.mapLibraryName("tiledb")}")
+        from file("$buildDir/tiledb_jni/Release/${System.mapLibraryName("tiledbjni")}")
     }
 
+
     manifest {
         attributes("Implementation-Title": "Gradle",
-                "Implementation-Version": version)
+                "Implementation-Version": archiveVersion)
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -13,5 +13,4 @@ pluginManagement {
         }
     }
 }
-enableFeaturePreview('STABLE_PUBLISHING')
 rootProject.name = 'tiledb-java'

src/main/c/custom/tiledb_custom.cxx

@@ -694,7 +694,7 @@ extern "C" {
     jintArray jresult = jenv->NewIntArray(sz);
     if (!jresult)
       return NULL;
-    jenv->SetIntArrayRegion(jresult, 0, sz, arr);
+    jenv->SetIntArrayRegion(jresult, 0, sz, (jint*) arr);
     return jresult;
   }
 
@@ -844,7 +844,8 @@ extern "C" {
     for(int i = 0; i<sz; i++){
       short_arr[i] = (jshort)arr[i];
     }
-    jenv->ReleaseShortArrayElements(jresult, short_arr, 0);
+    jenv->SetShortArrayRegion(jresult, 0, sz, short_arr);
+    delete short_arr;
     return jresult;
   }
 
@@ -894,7 +895,8 @@ extern "C" {
     for(int i = 0; i<sz; i++){
       int_arr[i] = (jint)arr[i];
     }
-    jenv->ReleaseIntArrayElements(jresult, int_arr, 0);
+    jenv->SetIntArrayRegion(jresult, 0, sz, int_arr);
+    delete int_arr;
     return jresult;
   }
 
@@ -921,7 +923,8 @@ extern "C" {
     for(int i = 0; i<sz; i++){
       long_arr[i] = (jlong)arr[i];
     }
-    jenv->ReleaseLongArrayElements(jresult, long_arr, 0);
+    jenv->SetLongArrayRegion(jresult, 0, sz, long_arr);
+    delete long_arr;
     return jresult;
   }
 
@@ -949,7 +952,8 @@ extern "C" {
     for(int i = 0; i<sz; i++){
       long_arr[i] = (jlong)arr[i];
     }
-    jenv->ReleaseLongArrayElements(jresult, long_arr, 0);
+    jenv->SetLongArrayRegion(jresult, 0, sz, long_arr);
+    delete long_arr;
     return jresult;
   }
 

src/main/java/io/tiledb/java/api/Config.java

@@ -29,6 +29,8 @@
 package io.tiledb.java.api;
 
 import io.tiledb.libtiledb.*;
+
+import java.io.File;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
@@ -115,7 +117,7 @@ public Config(URI uri) throws TileDBError {
       throw new TileDBError(
           "Config can an only read from a local file scheme URI (file://), got: " + uri);
     }
-    init(uri.getPath());
+    init(new File(uri).getAbsolutePath());
   }
 
   /**
@@ -298,7 +300,7 @@ public void saveToFile(URI uri) throws TileDBError {
       throw new TileDBError(
           "Config can an only save to a local file scheme URI (file://), got: " + uri);
     }
-    saveToFile(uri.getPath());
+    saveToFile(new File(uri).getAbsolutePath());
   }
 
   private void next(SWIGTYPE_p_tiledb_config_iter_t iterp) throws TileDBError {