Use addon factory v2

Author: wengxt

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.6)
 
 project(fcitx5-anthy VERSION 5.1.5)
 
+set(REQUIRED_FCITX_VERSION 5.1.12)
 find_package(ECM 1.0.0 REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(FeatureSummary)
@@ -11,7 +12,7 @@ include(ECMUninstallTarget)
 option(ENABLE_TEST "Build Test" On)
 option(ENABLE_COVERAGE "Build the project with gcov support (Need ENABLE_TEST=On)" Off)
 
-find_package(Fcitx5Core 5.1.12 REQUIRED)
+find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
 find_package(Fcitx5Module REQUIRED COMPONENTS Clipboard TestFrontend)
 find_package(Gettext REQUIRED)
 find_package(PkgConfig REQUIRED)

src/CMakeLists.txt

@@ -20,7 +20,7 @@ set( fcitx_anthy_sources
      nicola.cpp
     )
 
-add_library(anthy MODULE ${fcitx_anthy_sources})
+add_fcitx5_addon(anthy ${fcitx_anthy_sources})
 target_link_libraries(anthy Fcitx5::Core Fcitx5::Config ${ANTHY_TARGET} Fcitx5::Module::Clipboard stylefile)
 install(TARGETS anthy DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")
 fcitx5_translate_desktop_file(anthy.conf.in anthy.conf)

src/anthy-addon.conf.in.in

@@ -8,4 +8,4 @@ OnDemand=True
 Configurable=True
 
 [Dependencies]
-0=core/5.0.6
+0=core:@REQUIRED_FCITX_VERSION@

src/engine.cpp

@@ -608,4 +608,4 @@ void AnthyEngine::invokeActionImpl(const fcitx::InputMethodEntry &entry,
     anthy->updateUI();
 }
 
-FCITX_ADDON_FACTORY(AnthyFactory)
+FCITX_ADDON_FACTORY_V2(anthy, AnthyFactory)

test/testanthy.cpp

@@ -30,7 +30,8 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) {
         auto *testfrontend = instance->addonManager().addon("testfrontend");
         auto uuid =
             testfrontend->call<ITestFrontend::createInputContext>("testapp");
-        auto ic = instance->inputContextManager().findByUUID(uuid);
+        auto *ic = instance->inputContextManager().findByUUID(uuid);
+        FCITX_ASSERT(ic);
 
         RawConfig config;
         config.setValueByPath("General/TypingMethod", "Nicola");