diff --git a/CMakeLists.txt b/CMakeLists.txt index d9fb0215..3369f6cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ # CMake setup ############################################################ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.5) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") if(NOT CMAKE_BUILD_TYPE) diff --git a/build.gradle b/build.gradle index 406d9010..73cd03d5 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.29.1-SNAPSHOT' +version '0.30.0-SNAPSHOT' repositories { mavenCentral() diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index ea3b3876..c8eb1af6 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,30 +48,30 @@ if (NOT TILEDB_FOUND) # Try to download prebuilt artifacts unless the user specifies to build from source if(DOWNLOAD_TILEDB_PREBUILT) if (WIN32) # Windows - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.28.1/tiledb-windows-x86_64-2.28.1-d648231.zip") - SET(DOWNLOAD_SHA256 "4f1789f44896ee41a7328da2bfe43c4110eb4408fb5549e86333462bd16b0816") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.29.0/tiledb-windows-x86_64-2.29.0-958e736.zip") + SET(DOWNLOAD_SHA256 "c78feefdb45921bcc506d549638615aebe2781b4ea13d5a27dcc1ae0bc8e3d2c") elseif(APPLE) # macOS if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") message(STATUS "Building for intel mac") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.28.1/tiledb-macos-x86_64-2.28.1-d648231.tar.gz") - SET(DOWNLOAD_SHA256 "ff354d5ce81700ba2c7e74a21ad0c637847574e93bfae237c46b1d0bc46acb58") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.29.0/tiledb-macos-x86_64-2.29.0-958e736.tar.gz") + SET(DOWNLOAD_SHA256 "ba24f9c217ee002dcaf570ff83b40de76204b258d57b703c459fc58daff67682") elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") message(STATUS "Building for apple silicon mac") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.28.1/tiledb-macos-arm64-2.28.1-d648231.tar.gz") - SET(DOWNLOAD_SHA256 "186f820e3f9819bb8fc33bc67dca73e69fcbf92013ed3ed95e42de0f2d1274a4") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.29.0/tiledb-macos-arm64-2.29.0-958e736.tar.gz") + SET(DOWNLOAD_SHA256 "7d7d11dbed1d336b9f68287e2592c24c4cab696425c3421bc51ee93082877b91") endif() else() # Linux if (USE_AVX2) message(STATUS "Using Linux binaries with AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.28.1/tiledb-linux-x86_64-2.28.1-d648231.tar.gz") - SET(DOWNLOAD_SHA256 "2d37bbe827b3e69de77ef00fe7be19089210bf8e16fb5d6c93160586c0651156") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.29.0/tiledb-linux-x86_64-2.29.0-958e736.tar") + SET(DOWNLOAD_SHA256 "b9063af7807ac1284820c2affb441b332cc8792dfc40cea37fb7769976c02447") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.28.1/tiledb-linux-x86_64-noavx2-2.28.1-d648231.tar.gz") - SET(DOWNLOAD_SHA256 "3e6438ca7c083f97f4e8ec71578ccff1f797bb6e8f9ca4ba144dc41ec56e3162") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.29.0/tiledb-linux-x86_64-noavx2-2.29.0-958e736.tar.gz") + SET(DOWNLOAD_SHA256 "060e608425c0365d2c3432149dce5226630517d19fce24142f34943379260cc2") endif() endif() diff --git a/gradle.properties b/gradle.properties index 4c1a9de3..f30f99a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.28.0 +TILEDB_GIT_TAG=2.29.0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF diff --git a/src/test/java/io/tiledb/java/api/VersionTest.java b/src/test/java/io/tiledb/java/api/VersionTest.java index 876b4433..5056cc3f 100644 --- a/src/test/java/io/tiledb/java/api/VersionTest.java +++ b/src/test/java/io/tiledb/java/api/VersionTest.java @@ -34,7 +34,7 @@ public void testVersion() { Version version = new Version(); System.out.println(version); Assert.assertTrue(version.getMajor() == 2); - Assert.assertTrue(version.getMinor() == 28); - Assert.assertTrue(version.getRevision() == 1); + Assert.assertTrue(version.getMinor() == 29); + Assert.assertTrue(version.getRevision() == 0); } }