From 05e1c2e6f80c54b6698394d325bfc0abfe465c2d Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 13 Apr 2025 09:44:08 +0200
Subject: [PATCH] Use ECM's more elaborate APK version code logic

---
 CMakeLists.txt            | 3 +--
 android/build.gradle      | 9 ++++-----
 android/version.gradle.in | 6 ------
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 android/version.gradle.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76ba7c276..881388ba1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "6.6")
+set(KF_MIN_VERSION "6.12")
 set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -164,7 +164,6 @@ endif()
 
 if(ANDROID)
     find_package(Sqlite3)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
 endif()
 
 ki18n_install(po)
diff --git a/android/build.gradle b/android/build.gradle
index 2891cbbe7..f1ba8485c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -23,8 +23,7 @@ repositories {
 
 
 apply plugin: 'com.android.application'
-apply from: '../version.gradle'
-def timestamp = (int)(new Date().getTime()/1000)
+apply from: '../ecm-version.gradle'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
@@ -79,9 +78,9 @@ android {
         targetSdkVersion qtTargetSdkVersion
         applicationId "org.kde.neochat"
         namespace "org.kde.neochat"
-        versionCode timestamp
-        versionName projectVersionFull
-        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
+        versionCode ecmVersionCode
+        versionName ecmVersionName
+        manifestPlaceholders = [versionName: ecmVersionName, versionCode: ecmVersionCode]
     }
 
     packagingOptions {
diff --git a/android/version.gradle.in b/android/version.gradle.in
deleted file mode 100644
index 13f05b326..000000000
--- a/android/version.gradle.in
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-ext {
-    projectVersionFull = "@NEOCHAT_VERSION@"
-}