From 976b1785f36bab57527a01e272f349d44f302902 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Thu, 25 Jan 2024 20:19:31 +0200 Subject: [PATCH 1/8] update to TileDB-2.20.0-rc0 --- cmake/Modules/FindTileDB_EP.cmake | 20 +++++++++---------- gradle.properties | 2 +- .../java/io/tiledb/java/api/VersionTest.java | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 78ed55d2..6e6252a1 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.19.1/tiledb-windows-x86_64-2.19.1-29ceb3e7.zip") - SET(DOWNLOAD_SHA1 "b3c6002e8792501a8020aa71f2ea75019b6e3339") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc0/tiledb-windows-x86_64-2.20-rc0-16b321d.zip") + SET(DOWNLOAD_SHA1 "5be06b9f81df1236c44ad5fef12d5544fc659095") 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.19.1/tiledb-macos-x86_64-2.19.1-29ceb3e7.tar.gz") - SET(DOWNLOAD_SHA1 "c9c667689e0a8c4e5a2989f179995b0a013ca047") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc0/tiledb-macos-x86_64-2.20-rc0-16b321d.tar.gz") + SET(DOWNLOAD_SHA1 "cd167f6817f2436c5e01e4e80c81e0973f4f2ddf") 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.19.1/tiledb-macos-arm64-2.19.1-29ceb3e7.tar.gz") - SET(DOWNLOAD_SHA1 "eb15d2d6c2920011765e1c102a43c23b8d7b1b0f") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc0/tiledb-macos-arm64-2.20-rc0-16b321d.tar.gz") + SET(DOWNLOAD_SHA1 "c20eff415b3ebc983f460fd10f83c84db89e3b3f") 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.19.1/tiledb-linux-x86_64-2.19.1-29ceb3e7.tar.gz") - SET(DOWNLOAD_SHA1 "84dda6d2faa3abaef9dae296f16de1979df0f9b0") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc0/tiledb-linux-x86_64-2.20-rc0-16b321d.tar.gz") + SET(DOWNLOAD_SHA1 "e8d35e377c5f297777d8454c0de197dab36affe8") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-linux-x86_64-noavx2-2.19.1-29ceb3e7.tar.gz") - SET(DOWNLOAD_SHA1 "8269537ffd962ee8b5b55d0284ffc5af9544f876") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc0/tiledb-linux-x86_64-noavx2-2.20-rc0-16b321d.tar.gz") + SET(DOWNLOAD_SHA1 "3e6e6266032d6ee16bb783413592a2114cce15b4") endif() endif() diff --git a/gradle.properties b/gradle.properties index 83d043ab..1efb2c28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.19.1 +TILEDB_GIT_TAG=2.20.0-rc0 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 62f9afd6..0565cf9e 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() == 19); - Assert.assertTrue(version.getRevision() == 1); + Assert.assertTrue(version.getMinor() == 20); + Assert.assertTrue(version.getRevision() == 0); } } From 30254687e4df4e4c5d57c0b3535be5df60098c68 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 6 Feb 2024 13:33:57 +0200 Subject: [PATCH 2/8] update to TileDB-2.20.0-rc1 --- cmake/Modules/FindTileDB_EP.cmake | 20 ++++++++++---------- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 6e6252a1..91dcec7b 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.20.0-rc0/tiledb-windows-x86_64-2.20-rc0-16b321d.zip") - SET(DOWNLOAD_SHA1 "5be06b9f81df1236c44ad5fef12d5544fc659095") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-windows-x86_64-2.20.0-rc1-9a3c2dc.zip") + SET(DOWNLOAD_SHA1 "9e5a67f75312e11c1bf3ebc9b0e142c30062585c") 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.20.0-rc0/tiledb-macos-x86_64-2.20-rc0-16b321d.tar.gz") - SET(DOWNLOAD_SHA1 "cd167f6817f2436c5e01e4e80c81e0973f4f2ddf") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-macos-x86_64-2.20.0-rc1-9a3c2dc.tar.gz") + SET(DOWNLOAD_SHA1 "94ec0974b59dcd8b7fd5fd3c073d1586d41510da") 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.20.0-rc0/tiledb-macos-arm64-2.20-rc0-16b321d.tar.gz") - SET(DOWNLOAD_SHA1 "c20eff415b3ebc983f460fd10f83c84db89e3b3f") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-macos-arm64-2.20.0-rc1-9a3c2dc.tar.gz") + SET(DOWNLOAD_SHA1 "ae38050b92399f91032165af14d4211c8c1707ac") 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.20.0-rc0/tiledb-linux-x86_64-2.20-rc0-16b321d.tar.gz") - SET(DOWNLOAD_SHA1 "e8d35e377c5f297777d8454c0de197dab36affe8") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-linux-x86_64-2.20.0-rc1-9a3c2dc.tar.gz") + SET(DOWNLOAD_SHA1 "5f5b8954b34ca7d4f46c342ebdb190aaac9bb50c") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc0/tiledb-linux-x86_64-noavx2-2.20-rc0-16b321d.tar.gz") - SET(DOWNLOAD_SHA1 "3e6e6266032d6ee16bb783413592a2114cce15b4") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-linux-x86_64-noavx2-2.20.0-rc1-9a3c2dc.tar.gz") + SET(DOWNLOAD_SHA1 "a4ee66fc8484fa6340e757750b7e2a959117933c") endif() endif() diff --git a/gradle.properties b/gradle.properties index 1efb2c28..bd6053ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.20.0-rc0 +TILEDB_GIT_TAG=2.20.0-rc1 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF From b54c5421bbe47f29e9174777bef33ecb30696d50 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Tue, 6 Feb 2024 14:47:41 +0200 Subject: [PATCH 3/8] Rename `TILEDB_CORE_EXPORTS` to `tiledb_EXPORTS`. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20f1a4f7..d9fb0215 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ add_library(tiledbjni SHARED src/main/c/custom/tiledb_custom.cxx ) -target_compile_definitions(tiledbjni PRIVATE -DTILEDB_CORE_OBJECTS_EXPORTS) +target_compile_definitions(tiledbjni PRIVATE -Dtiledb_EXPORTS) target_include_directories(tiledbjni PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/swig" From 859c07041e2b87bcf05d59fe2c16028027edb184 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Mon, 12 Feb 2024 12:59:10 +0200 Subject: [PATCH 4/8] update to TileDB-2.20.0-rc2 --- cmake/Modules/FindTileDB_EP.cmake | 20 ++++++++++---------- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 91dcec7b..b8b019ad 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.20.0-rc1/tiledb-windows-x86_64-2.20.0-rc1-9a3c2dc.zip") - SET(DOWNLOAD_SHA1 "9e5a67f75312e11c1bf3ebc9b0e142c30062585c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc2/tiledb-windows-x86_64-2.20.0-rc2-40552aa.zip") + SET(DOWNLOAD_SHA1 "c5fc5c2eeb021bad62a9bebe5910fc0d8b297b0a") 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.20.0-rc1/tiledb-macos-x86_64-2.20.0-rc1-9a3c2dc.tar.gz") - SET(DOWNLOAD_SHA1 "94ec0974b59dcd8b7fd5fd3c073d1586d41510da") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc2/tiledb-macos-x86_64-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "8014a327a151b64b38811e0d712d6cfe38b663d9") 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.20.0-rc1/tiledb-macos-arm64-2.20.0-rc1-9a3c2dc.tar.gz") - SET(DOWNLOAD_SHA1 "ae38050b92399f91032165af14d4211c8c1707ac") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc2/tiledb-macos-arm64-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "d09d25e64580cdfd74c41d4dbbd9b00ad5b9f4b8") 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.20.0-rc1/tiledb-linux-x86_64-2.20.0-rc1-9a3c2dc.tar.gz") - SET(DOWNLOAD_SHA1 "5f5b8954b34ca7d4f46c342ebdb190aaac9bb50c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc2/tiledb-linux-x86_64-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "13efc1bfbd07a6fb26e2f13cd1fa449f85b06839") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-linux-x86_64-noavx2-2.20.0-rc1-9a3c2dc.tar.gz") - SET(DOWNLOAD_SHA1 "a4ee66fc8484fa6340e757750b7e2a959117933c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc2/tiledb-linux-x86_64-noavx2-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "f5018779c0b6522b86266f72b07425207e8b19c8") endif() endif() diff --git a/gradle.properties b/gradle.properties index bd6053ae..3e3a020d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.20.0-rc1 +TILEDB_GIT_TAG=2.20.0-rc2 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF From cb8a49dd8d0fdfe6e082774b278a1492c8192ca7 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Mon, 19 Feb 2024 18:22:12 +0200 Subject: [PATCH 5/8] update to TileDB-2.20.0 stable --- cmake/Modules/FindTileDB_EP.cmake | 10 +++++----- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index b8b019ad..65c3e2b9 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -48,29 +48,29 @@ 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.20.0-rc2/tiledb-windows-x86_64-2.20.0-rc2-40552aa.zip") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-windows-x86_64-2.20.0-40552aa.zip") SET(DOWNLOAD_SHA1 "c5fc5c2eeb021bad62a9bebe5910fc0d8b297b0a") 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.20.0-rc2/tiledb-macos-x86_64-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-macos-x86_64-2.20.0-40552aa.tar.gz") SET(DOWNLOAD_SHA1 "8014a327a151b64b38811e0d712d6cfe38b663d9") 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.20.0-rc2/tiledb-macos-arm64-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-macos-arm64-2.20.0-40552aa.tar.gz") SET(DOWNLOAD_SHA1 "d09d25e64580cdfd74c41d4dbbd9b00ad5b9f4b8") 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.20.0-rc2/tiledb-linux-x86_64-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-linux-x86_64-2.20.0-40552aa.tar.gz") SET(DOWNLOAD_SHA1 "13efc1bfbd07a6fb26e2f13cd1fa449f85b06839") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc2/tiledb-linux-x86_64-noavx2-2.20.0-rc2-40552aa.tar.gz") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-linux-x86_64-noavx2-2.20.0-40552aa.tar.gz") SET(DOWNLOAD_SHA1 "f5018779c0b6522b86266f72b07425207e8b19c8") endif() endif() diff --git a/gradle.properties b/gradle.properties index 3e3a020d..d6ad957a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.20.0-rc2 +TILEDB_GIT_TAG=2.20.0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF From 458204160f033d0e503f268e8b4b494fccc414e6 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Mon, 19 Feb 2024 18:22:53 +0200 Subject: [PATCH 6/8] update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3e14fb12..9ebaab0d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.21.1-SNAPSHOT' +version '0.22.0-SNAPSHOT' repositories { jcenter() From fe786c4aa8abab3ae6b3621d645182aab7b05d7e Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Mon, 19 Feb 2024 18:26:28 +0200 Subject: [PATCH 7/8] fix sha1sums --- cmake/Modules/FindTileDB_EP.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index 65c3e2b9..ab132d54 100644 --- a/cmake/Modules/FindTileDB_EP.cmake +++ b/cmake/Modules/FindTileDB_EP.cmake @@ -49,29 +49,29 @@ if (NOT TILEDB_FOUND) if(DOWNLOAD_TILEDB_PREBUILT) if (WIN32) # Windows SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-windows-x86_64-2.20.0-40552aa.zip") - SET(DOWNLOAD_SHA1 "c5fc5c2eeb021bad62a9bebe5910fc0d8b297b0a") + SET(DOWNLOAD_SHA1 "cb7df1c80c7034d2d8d16cea5114fdca7306e87d") 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.20.0/tiledb-macos-x86_64-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "8014a327a151b64b38811e0d712d6cfe38b663d9") + SET(DOWNLOAD_SHA1 "83af0a52e6756129472073393c28ec15d6265e0c") 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.20.0/tiledb-macos-arm64-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "d09d25e64580cdfd74c41d4dbbd9b00ad5b9f4b8") + SET(DOWNLOAD_SHA1 "78ea78b0d7ffe4edb5bc6f98a8b620cc6f7d0e85") 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.20.0/tiledb-linux-x86_64-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "13efc1bfbd07a6fb26e2f13cd1fa449f85b06839") + SET(DOWNLOAD_SHA1 "9104da8d6979c3b96e63b9e28fd41a403d412079") else() message(STATUS "Using Linux binaries without AVX2") SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-linux-x86_64-noavx2-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "f5018779c0b6522b86266f72b07425207e8b19c8") + SET(DOWNLOAD_SHA1 "e546891dffd5ab7e5ae846870233468e4f1eea9d") endif() endif() From 9606ee5bb199943d341facf23af5da6c68eed6cd Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 20 Feb 2024 17:41:08 +0200 Subject: [PATCH 8/8] update to TileDB-2.20.1 --- cmake/Modules/FindTileDB_EP.cmake | 20 +++++++++---------- gradle.properties | 2 +- .../java/io/tiledb/java/api/VersionTest.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmake/Modules/FindTileDB_EP.cmake b/cmake/Modules/FindTileDB_EP.cmake index ab132d54..1899e786 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.20.0/tiledb-windows-x86_64-2.20.0-40552aa.zip") - SET(DOWNLOAD_SHA1 "cb7df1c80c7034d2d8d16cea5114fdca7306e87d") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-windows-x86_64-2.20.1-249c024.zip") + SET(DOWNLOAD_SHA1 "988fdb6f9cf26ae4b9c06951dda6abfb288f51d8") 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.20.0/tiledb-macos-x86_64-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "83af0a52e6756129472073393c28ec15d6265e0c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-macos-x86_64-2.20.1-249c024.tar.gz") + SET(DOWNLOAD_SHA1 "d347916ae4b6f2c01adddf9f80a5cfbbb47dfb68") 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.20.0/tiledb-macos-arm64-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "78ea78b0d7ffe4edb5bc6f98a8b620cc6f7d0e85") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-macos-arm64-2.20.1-249c024.tar.gz") + SET(DOWNLOAD_SHA1 "d236d781328782d96b95c7cccbd2de07d91ef115") 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.20.0/tiledb-linux-x86_64-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "9104da8d6979c3b96e63b9e28fd41a403d412079") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-linux-x86_64-2.20.1-249c024.tar.gz") + SET(DOWNLOAD_SHA1 "53ab76f43e0c61389e5b2910c8c15cfbb483a0b7") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-linux-x86_64-noavx2-2.20.0-40552aa.tar.gz") - SET(DOWNLOAD_SHA1 "e546891dffd5ab7e5ae846870233468e4f1eea9d") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.1/tiledb-linux-x86_64-noavx2-2.20.1-249c024.tar.gz") + SET(DOWNLOAD_SHA1 "d68eabe87af3dd59a392ef7e67e44287f08a457d") endif() endif() diff --git a/gradle.properties b/gradle.properties index d6ad957a..b610a808 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.20.0 +TILEDB_GIT_TAG=2.20.1 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 0565cf9e..a94c2ff6 100644 --- a/src/test/java/io/tiledb/java/api/VersionTest.java +++ b/src/test/java/io/tiledb/java/api/VersionTest.java @@ -35,6 +35,6 @@ public void testVersion() { System.out.println(version); Assert.assertTrue(version.getMajor() == 2); Assert.assertTrue(version.getMinor() == 20); - Assert.assertTrue(version.getRevision() == 0); + Assert.assertTrue(version.getRevision() == 1); } }