diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 927ff01..44cd7bc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,6 @@ concurrency: cancel-in-progress: true env: - CMAKE_POLICY_VERSION_MINIMUM: "3.31" # Cap apt timeouts so an unreachable Azure mirror costs seconds, not 20 minutes. APT_OPTS: -o Acquire::Retries=2 -o Acquire::http::Timeout=10 diff --git a/.gitignore b/.gitignore index 51298a8..a3ba2e4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ cmake-build-debug/ .DS_Store test_results_*.log *.db + +# generated SBOMs (the release workflow attaches these to GitHub releases) +*.cdx.json diff --git a/CMakeLists.txt b/CMakeLists.txt index f2e6777..b90cc77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0...3.31) +cmake_minimum_required(VERSION 3.13...3.31) # Acquire countly version from constant file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/countly/constants.hpp COUNTLY_HPP_CONTENTS) diff --git a/bin/README.md b/bin/README.md deleted file mode 100644 index c2f58fb..0000000 --- a/bin/README.md +++ /dev/null @@ -1,25 +0,0 @@ -## Build Scripts - -Scripts provided here offers a convenient way to build sample app and the tests at different platforms. -Still SQLite setup must be done separately at the "/vendor/sqlite" directory if SQLite is needed. -Current cmake options set in the script that differs from the default are: - -- COUNTLY_BUILD_SAMPLE = ON -- COUNTLY_BUILD_TESTS = ON - -To change any other options you can manually modify the scripts. - -### Run - -You can run the scripts simply by executing them from the root directory. - -### Flow - -When run the script would: - -- Check if a build folder is present at the root and erase it if it exists -- Run Cmake with mentioned options -- Build countly-sample app -- Build countly-test - -After this point you can just go to the "/build" directory and execute those build files diff --git a/bin/mac_build_script.sh b/bin/mac_build_script.sh deleted file mode 100644 index e7a6198..0000000 --- a/bin/mac_build_script.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ "${PWD##*/}" = "build" ] -then - echo "In build folder. Changing directory..." - cd .. - echo "Current directory: $PWD" -else - echo "Not in build folder. Current directory: $PWD" -fi - -echo "Deleting folder and its subfolders..." -rm -rf build -echo "Folder and subfolders deleted." - -cmake -DCOUNTLY_BUILD_SAMPLE=1 -DCOUNTLY_BUILD_TESTS=1 -DCOUNTLY_USE_CUSTOM_SHA256=OFF -DCOUNTLY_USE_SQLITE=OFF -B build . - -cd build -make ./countly-sample -make ./countly-tests diff --git a/bin/windows_build_script.bat b/bin/windows_build_script.bat deleted file mode 100644 index d32e5c6..0000000 --- a/bin/windows_build_script.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -if /i "%CD:~-5%"=="build" ( - echo In build folder. Changing directory... - cd .. - echo Current directory: %CD% -) else ( - echo Not in build folder. Current directory: %CD% -) -echo Deleting folder and its subfolders... -rmdir /s /q build -echo Folder and subfolders deleted. -cmake -DCOUNTLY_BUILD_SAMPLE=1 -DCOUNTLY_BUILD_TESTS=1 -DCOUNTLY_USE_CUSTOM_SHA256=OFF -DCOUNTLY_USE_SQLITE=OFF -B build . -G "Unix Makefiles" -cd build -make ./countly-sample -make ./countly-tests \ No newline at end of file diff --git a/countly-sdk-cpp-26.8.0.cdx.json b/countly-sdk-cpp-26.8.0.cdx.json deleted file mode 100644 index bf5d0a7..0000000 --- a/countly-sdk-cpp-26.8.0.cdx.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "bomFormat": "CycloneDX", - "specVersion": "1.6", - "serialNumber": "urn:uuid:dd63718d-246f-4f50-b5e0-e18f98c41ca3", - "version": 1, - "metadata": { - "timestamp": "2026-08-19T05:33:08Z", - "supplier": { - "name": "Countly", - "url": [ - "https://countly.com" - ] - }, - "component": { - "bom-ref": "countly-sdk-cpp", - "type": "library", - "name": "countly-sdk-cpp", - "group": "countly", - "version": "26.8.0", - "purl": "pkg:github/countly/countly-sdk-cpp@26.8.0", - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ], - "externalReferences": [ - { - "type": "vcs", - "url": "https://github.com/Countly/countly-sdk-cpp" - } - ] - }, - "properties": [ - { - "name": "countly:sbom-type", - "value": "superset source SBOM: optional-scope components are gated by CMake options; system libraries carry no version because the consumer's build resolves them" - } - ] - }, - "components": [ - { - "bom-ref": "nlohmann-json", - "type": "library", - "name": "json", - "group": "nlohmann", - "version": "v3.12.0", - "purl": "pkg:github/nlohmann/json@55f93686c01528224f448c19128836e7df245f72", - "scope": "required", - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ], - "properties": [ - { - "name": "countly:origin", - "value": "vendored git submodule (vendor/json)" - }, - { - "name": "countly:condition", - "value": "always included; header-only, part of the SDK's public API surface" - }, - { - "name": "countly:pinned-commit", - "value": "55f93686c01528224f448c19128836e7df245f72" - } - ] - }, - { - "bom-ref": "sqlite3", - "type": "library", - "name": "sqlite", - "group": "sqlite", - "version": "3.53.4", - "purl": "pkg:generic/sqlite@3.53.4?download_url=https://sqlite.org", - "cpe": "cpe:2.3:a:sqlite:sqlite:3.53.4:*:*:*:*:*:*:*", - "scope": "optional", - "licenses": [ - { - "license": { - "id": "blessing" - } - } - ], - "properties": [ - { - "name": "countly:origin", - "value": "official sqlite.org amalgamation vendored in vendor/sqlite3, compiled into the library" - }, - { - "name": "countly:cmake-option", - "value": "COUNTLY_USE_SQLITE=ON (with COUNTLY_USE_SYSTEM_SQLITE=OFF, the default)" - }, - { - "name": "countly:condition", - "value": "compiled in only when COUNTLY_USE_SQLITE=ON and COUNTLY_USE_SYSTEM_SQLITE=OFF" - }, - { - "name": "countly:compile-flags", - "value": "SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_DEPRECATED SQLITE_DEFAULT_MEMSTATUS=0; FTS/RTree/Geopoly/RBU/ICU not enabled" - } - ] - }, - { - "bom-ref": "sqlite3-system", - "type": "library", - "name": "sqlite (system)", - "purl": "pkg:generic/sqlite", - "scope": "optional", - "properties": [ - { - "name": "countly:origin", - "value": "system library, resolved at consumer build time (find_package(SQLite3))" - }, - { - "name": "countly:cmake-option", - "value": "COUNTLY_USE_SQLITE=ON with COUNTLY_USE_SYSTEM_SQLITE=ON" - }, - { - "name": "countly:condition", - "value": "linked instead of the vendored amalgamation when COUNTLY_USE_SYSTEM_SQLITE=ON; version is determined by the consumer's environment" - } - ] - }, - { - "bom-ref": "openssl", - "type": "library", - "name": "openssl", - "purl": "pkg:generic/openssl", - "scope": "optional", - "properties": [ - { - "name": "countly:origin", - "value": "system library, resolved at consumer build time (find_package(OpenSSL))" - }, - { - "name": "countly:cmake-option", - "value": "COUNTLY_USE_CUSTOM_SHA256=OFF (default)" - }, - { - "name": "countly:condition", - "value": "linked unless the consumer supplies a custom SHA-256 implementation; version is determined by the consumer's environment" - } - ] - }, - { - "bom-ref": "libcurl", - "type": "library", - "name": "curl", - "purl": "pkg:generic/curl", - "scope": "optional", - "properties": [ - { - "name": "countly:origin", - "value": "system library, resolved at consumer build time (find_package(CURL))" - }, - { - "name": "countly:cmake-option", - "value": "COUNTLY_USE_CUSTOM_HTTP=OFF (default)" - }, - { - "name": "countly:condition", - "value": "linked on non-Windows platforms unless the consumer supplies a custom HTTP function; version is determined by the consumer's environment" - } - ] - }, - { - "bom-ref": "winhttp", - "type": "library", - "name": "WinHTTP", - "scope": "optional", - "properties": [ - { - "name": "countly:origin", - "value": "Windows operating-system component" - }, - { - "name": "countly:cmake-option", - "value": "COUNTLY_USE_CUSTOM_HTTP=OFF (default)" - }, - { - "name": "countly:condition", - "value": "used on Windows unless the consumer supplies a custom HTTP function" - } - ] - }, - { - "bom-ref": "doctest", - "type": "library", - "name": "doctest", - "group": "doctest", - "version": "v2.5.3", - "purl": "pkg:github/doctest/doctest@2d0a9359a60c51affe2a9bebb1be1dca47868151", - "scope": "excluded", - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ], - "properties": [ - { - "name": "countly:origin", - "value": "vendored git submodule (vendor/doctest)" - }, - { - "name": "countly:cmake-option", - "value": "COUNTLY_BUILD_TESTS=ON" - }, - { - "name": "countly:condition", - "value": "test framework only; never part of the shipped library" - }, - { - "name": "countly:pinned-commit", - "value": "2d0a9359a60c51affe2a9bebb1be1dca47868151" - } - ] - } - ], - "dependencies": [ - { - "ref": "countly-sdk-cpp", - "dependsOn": [ - "nlohmann-json", - "sqlite3", - "sqlite3-system", - "openssl", - "libcurl", - "winhttp" - ] - } - ] -}