diff --git a/libpkg/data/config.h b/libpkg/data/config.h index cb11e6d..c8c0fba 100644 --- a/libpkg/data/config.h +++ b/libpkg/data/config.h @@ -83,7 +83,7 @@ struct LIBPKG_EXPORT CommonLicense : public ReflectiveRapidJSON::JsonSerializabl }; struct LIBPKG_EXPORT LicenseResult : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::map commonLicenses; std::map> customLicences; std::vector consideredPackages; diff --git a/libpkg/data/database.h b/libpkg/data/database.h index 287c943..0729ec6 100644 --- a/libpkg/data/database.h +++ b/libpkg/data/database.h @@ -76,7 +76,7 @@ struct LIBPKG_EXPORT PackageUpdate : public ReflectiveRapidJSON::JsonSerializabl }; struct LIBPKG_EXPORT PackageUpdates : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::vector versionUpdates; std::vector packageUpdates; std::vector downgrades; @@ -91,7 +91,7 @@ struct LIBPKG_EXPORT PackageLocation { }; struct LIBPKG_EXPORT UnresolvedDependencies : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::vector deps; std::vector libs; }; diff --git a/libpkg/data/package.h b/libpkg/data/package.h index be33aa0..b5f6d33 100644 --- a/libpkg/data/package.h +++ b/libpkg/data/package.h @@ -146,7 +146,7 @@ inline Dependency Dependency::fromString(std::string_view dependency) struct LIBPKG_EXPORT DatabaseDependency : public Dependency, public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { explicit DatabaseDependency() = default; explicit DatabaseDependency(const std::string &name, const std::string &version, DependencyMode mode); explicit DatabaseDependency(std::string &&name, std::string &&version, DependencyMode mode); @@ -164,7 +164,7 @@ inline DatabaseDependency::DatabaseDependency(const std::string &name, const std } struct LIBPKG_EXPORT DatabaseLibraryDependency : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { explicit DatabaseLibraryDependency() = default; explicit DatabaseLibraryDependency(const std::string &name); std::string name; @@ -369,7 +369,7 @@ template <> struct hash { namespace LibPkg { -struct LIBPKG_EXPORT Package : public ReflectiveRapidJSON::JsonSerializable, public ReflectiveRapidJSON::BinarySerializable { +struct LIBPKG_EXPORT Package : public ReflectiveRapidJSON::JsonSerializable, public ReflectiveRapidJSON::BinarySerializable { Package() = default; Package(const Package &other); Package(Package &&other) = default; diff --git a/librepomgr/CMakeLists.txt b/librepomgr/CMakeLists.txt index fc4291e..814b7b7 100644 --- a/librepomgr/CMakeLists.txt +++ b/librepomgr/CMakeLists.txt @@ -71,7 +71,7 @@ set(META_APP_DESCRIPTION "Library for managing custom Arch Linux repositories") set(META_VERSION_MAJOR 0) set(META_VERSION_MINOR 0) set(META_VERSION_PATCH 1) -set(META_VERSION_CACHE 10) +set(META_VERSION_CACHE 11) set(META_VERSION_BUILD_ACTIONS_JSON 0) set(META_VERSION_LIBRARY_DEPENDENCIES_JSON 0) set(LINK_TESTS_AGAINST_APP_TARGET ON) diff --git a/librepomgr/buildactions/buildaction.h b/librepomgr/buildactions/buildaction.h index beb8d4c..f7e6295 100644 --- a/librepomgr/buildactions/buildaction.h +++ b/librepomgr/buildactions/buildaction.h @@ -50,7 +50,7 @@ struct InternalBuildAction; using AssociatedLocks = std::vector>; struct LIBREPOMGR_EXPORT PackageBuildData : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::string existingVersion; std::vector> existingPackages; std::string sourceDirectory; @@ -64,7 +64,7 @@ struct LIBREPOMGR_EXPORT PackageBuildData : public ReflectiveRapidJSON::JsonSeri }; struct LIBREPOMGR_EXPORT BuildPreparation : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::unordered_map buildData; std::vector>> dbConfig, stagingDbConfig; std::string targetDb, targetArch, stagingDb; @@ -82,7 +82,7 @@ enum class PackageStagingNeeded { }; struct LIBREPOMGR_EXPORT PackageBuildProgress : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { bool hasBeenAnyProgressMade() const; void resetProgress(); void resetChrootSettings(); @@ -108,7 +108,7 @@ struct LIBREPOMGR_EXPORT PackageBuildProgress : public ReflectiveRapidJSON::Json }; struct LIBREPOMGR_EXPORT RebuildInfo : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::vector provides; std::vector libprovides; @@ -120,7 +120,7 @@ using RebuildInfoByPackage = std::unordered_map; using RebuildInfoByDatabase = std::unordered_map; struct LIBREPOMGR_EXPORT BuildProgress : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::unordered_map progressByPackage; std::string targetDbFilePath; std::string targetRepoPath; @@ -131,21 +131,21 @@ struct LIBREPOMGR_EXPORT BuildProgress : public ReflectiveRapidJSON::JsonSeriali }; struct LIBREPOMGR_EXPORT PackageMovementResult : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::vector> failedPackages; std::vector processedPackages; std::string errorMessage; }; struct LIBREPOMGR_EXPORT RepositoryProblem : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::variant desc; std::string pkg; bool critical = true; }; struct LIBREPOMGR_EXPORT BuildActionMessages : public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { std::vector notes; std::vector warnings; std::vector errors; @@ -157,7 +157,7 @@ struct ServiceSetup; struct LIBREPOMGR_EXPORT BuildAction : public std::enable_shared_from_this, public ReflectiveRapidJSON::JsonSerializable, - public ReflectiveRapidJSON::BinarySerializable { + public ReflectiveRapidJSON::BinarySerializable { friend InternalBuildAction; friend ServiceSetup; friend BuildProcessSession;