From 6974b7682ee29308b83b85ef32f0fca2b65df229 Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Mon, 19 May 2025 18:13:19 +0200
Subject: [PATCH] Update CI

---
 .github/workflows/build-debug.yml | 2 +-
 build.gradle.kts                  | 8 ++++++--
 tool/src/main/AndroidManifest.xml | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml
index 9a93a64..be11d2e 100644
--- a/.github/workflows/build-debug.yml
+++ b/.github/workflows/build-debug.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
         with:
-          cmdline-tools-version: 16.0
+          cmdline-tools-version: 12266719
       - name: NDK Cache
         id: ndk-cache
         uses: actions/cache@v3
diff --git a/build.gradle.kts b/build.gradle.kts
index ca38c8f..f524c05 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,11 +13,15 @@ if (versionPropsFile.exists()) {
     }
 }
 
+// Check if versionName and versionCode are provided via command line
+val cmdVersionCode = project.findProperty("versionCode")?.toString()?.toIntOrNull()
+val cmdVersionName = project.findProperty("versionName") as String?
+
 // Define the version properties in the extra properties extension
 ext {
     set("compileSdkVersion", 35)
     set("minSdkVersion", 26)
     set("targetSdkVersion", 35)
-    set("appVersionCode", (versionProps["versionCode"] as String).toInt())
-    set("appVersionName", versionProps["versionName"] as String)
+    set("appVersionCode", cmdVersionCode ?: (versionProps["versionCode"] as String).toInt())
+    set("appVersionName", cmdVersionName ?: versionProps["versionName"] as String)
 }
\ No newline at end of file
diff --git a/tool/src/main/AndroidManifest.xml b/tool/src/main/AndroidManifest.xml
index 1e5d7d7..f04d6d7 100644
--- a/tool/src/main/AndroidManifest.xml
+++ b/tool/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.netbird.client.tool">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />