Use new kpimgapi

CMakeLists.txt

@@ -44,7 +44,7 @@ set(KDEPIM_RUNTIME_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}${KDEPIM_RUNTIME_DEV
 
 configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY)
 
-set(KF5_VERSION "5.30.0")
+set(KF5_VERSION "5.31.0")
 find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${kdepim-runtime_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
 
@@ -143,7 +143,7 @@ set_package_properties(Sasl2 PROPERTIES
 )
 
 # Extra package
-find_package(KF5GAPI "5.3.1" CONFIG)
+find_package(KPimGAPI "5.4.40" CONFIG)
 
 
 add_subdirectory(resources)

resources/CMakeLists.txt

@@ -55,7 +55,7 @@ add_subdirectory( maildir )
 add_subdirectory( openxchange )
 add_subdirectory( pop3 )
 
-if( KF5GAPI_FOUND )
+if( KPimGAPI_FOUND )
   add_subdirectory( google )
   # Disabled in KDE 4.14 - too many issues for stable release
   #add_subdirectory( gmail )

resources/google/calendar/CMakeLists.txt

@@ -47,9 +47,9 @@ target_link_libraries(akonadi_googlecalendar_resource
   KF5::AkonadiCore
   KF5::CalendarCore
   KF5::AkonadiCalendar
-  KF5::GAPICalendar
-  KF5::GAPICore
-  KF5::GAPITasks
+  KPim::GAPICalendar
+  KPim::GAPICore
+  KPim::GAPITasks
   KF5::AkonadiAgentBase
   KF5::Wallet
   KF5::I18n

resources/google/contacts/CMakeLists.txt

@@ -42,8 +42,8 @@ endif()
 target_link_libraries(akonadi_googlecontacts_resource
   KF5::AkonadiCore
   KF5::Contacts
-  KF5::GAPICore
-  KF5::GAPIContacts
+  KPim::GAPICore
+  KPim::GAPIContacts
   KF5::AkonadiAgentBase
   KF5::Wallet
   KF5::I18n

resources/imap/CMakeLists.txt

 add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_imap_resource\")
 
-if (Sasl2_FOUND AND KF5GAPI_FOUND)
+if (Sasl2_FOUND AND KPimGAPI_FOUND)
     set(WITH_GMAIL_XOAUTH2 TRUE)
     add_subdirectory(saslplugin)
 endif()
@@ -130,7 +130,7 @@ target_link_libraries(akonadi_imap_resource
     folderarchivesettings)
 
 if (WITH_GMAIL_XOAUTH2)
-    target_link_libraries(akonadi_imap_resource KF5::GAPICore)
+    target_link_libraries(akonadi_imap_resource KPim::GAPICore)
 endif ()
 
 install(TARGETS akonadi_imap_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

resources/imap/gmailpasswordrequester.cpp

@@ -22,8 +22,8 @@
 #include "settings.h"
 #include "imapresource_debug.h"
 
-#include <KGAPI/kgapi/account.h>
-#include <KGAPI/kgapi/authjob.h>
+#include <KGAPI/Account>
+#include <KGAPI/AuthJob>
 
 #define GOOGLE_API_KEY QStringLiteral("554041944266.apps.googleusercontent.com")
 #define GOOGLE_API_SECRET QStringLiteral("mdT1DjzohxN3npUUzkENT0gO")