Update CI

This commit is contained in:
Zoltan Papp
2025-05-19 18:13:19 +02:00
parent 1ef5c7c2e3
commit 6974b7682e
3 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -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
+6 -2
View File
@@ -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)
}
+1 -2
View File
@@ -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" />