Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/github_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-22.04, macos-13, macos-14 ]
os: [ ubuntu-22.04, macos-14 ]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
8 changes: 1 addition & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ plugins {
id 'maven-publish'
id 'signing'
id 'com.github.sherter.google-java-format' version '0.9'
id 'io.codearte.nexus-staging' version '0.30.0'
id 'com.google.osdetector' version '1.6.0'
}

group 'io.tiledb'
version '0.30.0-SNAPSHOT'
version '0.31.0-SNAPSHOT'

repositories {
mavenCentral()
Expand All @@ -18,11 +17,6 @@ repositories {
}
}

nexusStaging {
username = System.getenv('SONATYPE_CENTRAL_USERNAME')
password = System.getenv('SONATYPE_CENTRAL_PASSWORD')
}

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
20 changes: 10 additions & 10 deletions cmake/Modules/FindTileDB_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.1/tiledb-windows-x86_64-2.29.1-9a6284d.zip")
SET(DOWNLOAD_SHA256 "601381c85a3da31ad4ef352880b38cbaf8363ea147cf3830a8aba6fc3e38fed1")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.30.0/tiledb-windows-x86_64-2.30.0-9b5305d.zip")
SET(DOWNLOAD_SHA256 "c24d2bed163474f68492be0faae82c1fefda7bad0e11debb65dbdf580de5f8a3")
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.29.1/tiledb-macos-x86_64-2.29.1-9a6284d.tar.gz")
SET(DOWNLOAD_SHA256 "132d5f42fe09c1560c841fbdaa67a9e43c8f0c2414cff88eed239a4a8b471b9c")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.30.0/tiledb-macos-x86_64-2.30.0-9b5305d.tar.gz")
SET(DOWNLOAD_SHA256 "0896cffbbe8fbae2c54c6cbc0fe0537f904ea40c499f931bb1ec305a0684d96b")

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.29.1/tiledb-macos-arm64-2.29.1-9a6284d.tar.gz")
SET(DOWNLOAD_SHA256 "ea7aeac32154e774ae69de27c4ec22cfb170800ed52dcc5f3962c1242e7d76e7")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.30.0/tiledb-macos-arm64-2.30.0-9b5305d.tar.gz")
SET(DOWNLOAD_SHA256 "2a35322a18636d30a2bd2189ae9a8de5f5339f80776be535a427629f79c70538")
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.29.1/tiledb-linux-x86_64-2.29.1-9a6284d.tar.gz")
SET(DOWNLOAD_SHA256 "b3e9178facbb8f12e21199f287e024a3e2da36d4cfef762ec0ebee19422672b6")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.30.0/tiledb-linux-x86_64-2.30.0-9b5305d.tar.gz")
SET(DOWNLOAD_SHA256 "ab309ffe097c4346c0a15df2889c2b47a565806ad0d584b81c4790f879f20f3f")
else()
message(STATUS "Using Linux binaries without AVX2")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.29.1/tiledb-linux-x86_64-noavx2-2.29.1-9a6284d.tar.gz")
SET(DOWNLOAD_SHA256 "289e4a90e15dd24e93143c756144c92e6b93bf958a260e5bd8ca2b7ebaee47e4")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.30.0/tiledb-linux-x86_64-noavx2-2.30.0-9b5305d.tar.gz")
SET(DOWNLOAD_SHA256 "0099d79e60cae4b20c6943932c1df40da918a34ee8d95645e938731e56c65715")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
TILEDB_GIT_TAG=2.29.1
TILEDB_GIT_TAG=2.30.0
TILEDB_VERBOSE=ON
TILEDB_S3=ON
TILEDB_AZURE=OFF
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/tiledb/java/api/VersionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void testVersion() {
Version version = new Version();
System.out.println(version);
Assert.assertTrue(version.getMajor() == 2);
Assert.assertTrue(version.getMinor() == 29);
Assert.assertTrue(version.getRevision() == 1);
Assert.assertTrue(version.getMinor() == 30);
Assert.assertTrue(version.getRevision() == 0);
}
}
Loading