[#199] Drop support for building with iRODS 4.3.1

This commit drops support for building with the iRODS 4.3.1 development
library. It also adds a range of iRODS versions which are supported for
building the project.

Author: alanking

.github/workflows/build-and-test-s3-api-ubuntu.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os-version: [ '22.04' ]
-        irods-version: [ 4.3.1, 4.3.4, 5.0.0, 5.0.2 ]
+        irods-version: [ 4.3.2, 4.3.4, 5.0.0, 5.0.2 ]
     runs-on: ubuntu-latest
     container: ubuntu:${{ matrix.os-version }}
     steps:
@@ -60,9 +60,7 @@ jobs:
               wget -qO - https://unstable.irods.org/irods-unstable-signing-key.asc | apt-key add -
               echo "deb [arch=amd64] https://unstable.irods.org/apt/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/renci-irods-unstable.list
               apt-get update -qq
-              # clang13.0.0-0 only needed for 4.3.1. Once support is dropped, we can remove this.
               apt-get install -qq \
-                irods-externals-clang13.0.0-0 \
                 irods-externals-jsoncons0.178.0-0 \
 
       - name: Configure Ccache
@@ -111,7 +109,7 @@ jobs:
       fail-fast: false
       matrix:
         os-version: [ '22.04' ]
-        irods-version: [ 4.3.1, 4.3.4, 5.0.0, 5.0.2 ]
+        irods-version: [ 4.3.2, 4.3.4, 5.0.0, 5.0.2 ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

CMakeLists.txt

@@ -4,7 +4,9 @@ cmake_minimum_required(VERSION 3.18.0 FATAL_ERROR)
 # Build Configuration
 #
 
-find_package(IRODS REQUIRED)
+set(IRODS_MINIMUM_VERSION "4.3.2")
+set(IRODS_MAXIMUM_VERSION "6.0.0")
+find_package(IRODS "${IRODS_MINIMUM_VERSION}...<${IRODS_MAXIMUM_VERSION}" REQUIRED)
 
 include(RequireOutOfSourceBuild)
 
@@ -104,12 +106,8 @@ find_package(CURL REQUIRED)
 find_package(nlohmann_json "3.6.1" REQUIRED)
 find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
 
-if (IRODS_VERSION VERSION_GREATER "4.3.1")
-  find_package(fmt "8.1.1"
-    HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
-  find_package(spdlog "1.9.2"
-    HINTS "${IRODS_EXTERNALS_FULLPATH_SPDLOG}")
-endif()
+find_package(fmt "8.1.1" HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
+find_package(spdlog "1.9.2" HINTS "${IRODS_EXTERNALS_FULLPATH_SPDLOG}")
 
 include(ObjectTargetHelpers)
 

README.md

@@ -166,7 +166,7 @@ If the container was launched with `-d`, use `docker container stop <container_n
 
 ### Build Dependencies
 
-- iRODS development package _(4.3.1 or later)_
+- iRODS development package _(4.3.2 or later)_
 - iRODS externals package for boost
 - iRODS externals package for catch2
 - iRODS externals package for fmt

core/CMakeLists.txt

@@ -59,26 +59,11 @@ target_include_directories(
   "${IRODS_EXTERNALS_FULLPATH_JSONCONS}/include"
 )
 
-if (IRODS_VERSION VERSION_GREATER "4.3.1")
-  target_link_libraries(
-    irods_s3_api_core
-    PUBLIC
-    fmt::fmt
-    spdlog::spdlog
-  )
-else()
-  target_link_libraries(
-    irods_s3_api_core
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
-  )
-
-  target_include_directories(
-    irods_s3_api_core
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
-    "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
-  )
-endif()
+target_link_libraries(
+  irods_s3_api_core
+  PUBLIC
+  fmt::fmt
+  spdlog::spdlog
+)
 
 set_target_properties(irods_s3_api_core PROPERTIES EXCLUDE_FROM_ALL TRUE)

endpoints/s3/CMakeLists.txt

@@ -39,26 +39,11 @@ target_include_directories(
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
 )
 
-if (IRODS_VERSION VERSION_GREATER "4.3.1")
-  target_link_libraries(
-    irods_s3_endpoints
-    PUBLIC
-    fmt::fmt
-    spdlog::spdlog
-  )
-else()
-  target_link_libraries(
-    irods_s3_endpoints
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
-  )
-
-  target_include_directories(
-    irods_s3_endpoints
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
-    "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
-  )
-endif()
+target_link_libraries(
+  irods_s3_endpoints
+  PUBLIC
+  fmt::fmt
+  spdlog::spdlog
+)
 
 set_target_properties(irods_s3_endpoints PROPERTIES EXCLUDE_FROM_ALL TRUE)

plugins/bucket_mapping/CMakeLists.txt

@@ -18,26 +18,12 @@ target_link_libraries(
   ${CMAKE_DL_LIBS}
 )
 
-if (IRODS_VERSION VERSION_GREATER "4.3.1")
-  target_link_libraries(
-    ${plugin_target}
-    PRIVATE
-    fmt::fmt
-    spdlog::spdlog
-  )
-else()
-  target_link_libraries(
-    ${plugin_target}
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
-  )
-  target_include_directories(
-    ${plugin_target}
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
-    "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
-  )
-endif()
+target_link_libraries(
+  ${plugin_target}
+  PRIVATE
+  fmt::fmt
+  spdlog::spdlog
+)
 
 target_include_directories(
   ${plugin_target}

plugins/user_mapping/CMakeLists.txt

@@ -18,26 +18,12 @@ target_link_libraries(
   ${CMAKE_DL_LIBS}
 )
 
-if (IRODS_VERSION VERSION_GREATER "4.3.1")
-  target_link_libraries(
-    ${plugin_target}
-    PRIVATE
-    fmt::fmt
-    spdlog::spdlog
-  )
-else()
-  target_link_libraries(
-    ${plugin_target}
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
-  )
-  target_include_directories(
-    ${plugin_target}
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
-    "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
-  )
-endif()
+target_link_libraries(
+  ${plugin_target}
+  PRIVATE
+  fmt::fmt
+  spdlog::spdlog
+)
 
 target_include_directories(
   ${plugin_target}

tests/docker/compose-irods-4.3.1.yml tests/docker/compose-irods-4.3.2.ymltests/docker/compose-irods-4.3.1.yml renamed to tests/docker/compose-irods-4.3.2.yml

@@ -41,7 +41,7 @@ RUN apt-get update && \
     && \
     rm -rf /tmp/*
 
-ARG irods_version=4.3.1
+ARG irods_version=4.3.2
 ARG irods_package_version_suffix=-0~jammy
 ARG irods_package_version=${irods_version}${irods_package_version_suffix}
 

tests/docker/irods_catalog_provider-irods4/Dockerfile

@@ -43,27 +43,12 @@ target_link_libraries(
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so"
 )
 
-if (IRODS_VERSION VERSION_GREATER "4.3.1")
-  target_link_libraries(
-    ${IRODS_TEST_EXECUTABLE}
-    PUBLIC
-    fmt::fmt
-    spdlog::spdlog
-  )
-else()
-  target_link_libraries(
-    ${IRODS_TEST_EXECUTABLE}
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
-  )
-
-  target_include_directories(
-    ${IRODS_TEST_EXECUTABLE}
-    PRIVATE
-    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
-    "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
-  )
-endif()
+target_link_libraries(
+  ${IRODS_TEST_EXECUTABLE}
+  PUBLIC
+  fmt::fmt
+  spdlog::spdlog
+)
 
 # Make the test available to CTest.
 catch_discover_tests(${IRODS_TEST_EXECUTABLE})