From fa05fff2b77b33c92fa5def538c754d8e589e78f Mon Sep 17 00:00:00 2001 From: Dimitris Staratzis <33267511+DimitrisStaratzis@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:28:12 +0300 Subject: [PATCH 1/3] update to rc1 --- 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 248ddc47..c75d01b9 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.21.2/tiledb-windows-x86_64-2.21.2-635e5e9.zip") - SET(DOWNLOAD_SHA1 "604cf475e2c2cdc1b55785d5f655883977112797") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0-rc1/tiledb-windows-x86_64-2.22.0-rc1-52e981e.zip") + SET(DOWNLOAD_SHA1 "7aa9632730643ba9ea95dc6fa320ff2fb92f4a0c") 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.21.2/tiledb-macos-x86_64-2.21.2-635e5e9.tar.gz") - SET(DOWNLOAD_SHA1 "046581379987f662b24f2bcc1cb8c1486f790ccb") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0-rc1/tiledb-macos-x86_64-2.22.0-rc1-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "ac0c3b2b7f6b1d77ed60a00f194ddc045f331a67") 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.21.2/tiledb-macos-arm64-2.21.2-635e5e9.tar.gz") - SET(DOWNLOAD_SHA1 "2ddbf8142662c7ca4343dcd48d42b94e13534524") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0-rc1/tiledb-macos-arm64-2.22.0-rc1-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "64ebbd54ef9063be2222392cdf141cf5a68969fb") 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.21.2/tiledb-linux-x86_64-2.21.2-635e5e9.tar.gz") - SET(DOWNLOAD_SHA1 "11c13010ffa1da6b31256c274352b6d5e7d4ccdb") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0-rc1/tiledb-linux-x86_64-2.22.0-rc1-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "8c100d76acff3b847348243110005723183b36cf") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.21.2/tiledb-linux-x86_64-noavx2-2.21.2-635e5e9.tar.gz") - SET(DOWNLOAD_SHA1 "4b808675b5f5a1b4608d9fb056cc24e9e3b03f15") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0-rc1/tiledb-linux-x86_64-noavx2-2.22.0-rc1-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "befa001561d157d3120ad53630f3efd9c0406a5a") endif() endif() diff --git a/gradle.properties b/gradle.properties index d0744909..6bbc7b13 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.21.2 +TILEDB_GIT_TAG=2.22.0-rc1 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 c88d31b2..beacaab7 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() == 21); - Assert.assertTrue(version.getRevision() == 2); + Assert.assertTrue(version.getMinor() == 22); + Assert.assertTrue(version.getRevision() == 0); } } From 9403eee98229a0556427f6c644fa702843f9520c Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 16 Apr 2024 00:23:29 +0300 Subject: [PATCH 2/3] update to TileDB-2.22.0-stable --- 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 c75d01b9..5aab0ae7 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.22.0-rc1/tiledb-windows-x86_64-2.22.0-rc1-52e981e.zip") - SET(DOWNLOAD_SHA1 "7aa9632730643ba9ea95dc6fa320ff2fb92f4a0c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-windows-x86_64-2.22.0-52e981e.zip") + SET(DOWNLOAD_SHA1 "7c1852c1c916be650cf7f75b238844104370cb1f") 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.22.0-rc1/tiledb-macos-x86_64-2.22.0-rc1-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "ac0c3b2b7f6b1d77ed60a00f194ddc045f331a67") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-macos-x86_64-2.22.0-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "a0b6b91a448aefae351cbe96c5cc2c8867eb2b07") 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.22.0-rc1/tiledb-macos-arm64-2.22.0-rc1-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "64ebbd54ef9063be2222392cdf141cf5a68969fb") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-macos-arm64-2.22.0-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "838ab13090f0832e3858b88aa3aa9b38bde7c7cb") 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.22.0-rc1/tiledb-linux-x86_64-2.22.0-rc1-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "8c100d76acff3b847348243110005723183b36cf") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-linux-x86_64-2.22.0-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "292fdd4d4034ef7e4686da04b1ffc9e7976f1601") else() message(STATUS "Using Linux binaries without AVX2") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0-rc1/tiledb-linux-x86_64-noavx2-2.22.0-rc1-52e981e.tar.gz") - SET(DOWNLOAD_SHA1 "befa001561d157d3120ad53630f3efd9c0406a5a") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.22.0/tiledb-linux-x86_64-noavx2-2.22.0-52e981e.tar.gz") + SET(DOWNLOAD_SHA1 "219cff96005c0d7c05112197f3cc546d2cbcf4b4") endif() endif() diff --git a/gradle.properties b/gradle.properties index 6bbc7b13..41a4afe4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB -TILEDB_GIT_TAG=2.22.0-rc1 +TILEDB_GIT_TAG=2.22.0 TILEDB_VERBOSE=ON TILEDB_S3=ON TILEDB_AZURE=OFF From 0fbf748a6f44ccfb2dcd3e2d9fab4f6dfb901b52 Mon Sep 17 00:00:00 2001 From: dimitrisstaratzis Date: Tue, 16 Apr 2024 18:21:06 +0300 Subject: [PATCH 3/3] update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e6fa5654..6f9f33bb 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.tiledb' -version '0.23.2-SNAPSHOT' +version '0.24.0-SNAPSHOT' repositories { jcenter()