From 56ce2d4c4bb7202f7ab4776aeca1bd877d185863 Mon Sep 17 00:00:00 2001
From: Catfriend1 <16361913+Catfriend1@users.noreply.github.com>
Date: Tue, 22 Oct 2024 01:17:16 +0200
Subject: [PATCH] Update update_fdroid_mirror_repo_from_main.cmd

---
 update_fdroid_mirror_repo_from_main.cmd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/update_fdroid_mirror_repo_from_main.cmd b/update_fdroid_mirror_repo_from_main.cmd
index 3c8c6df80..8473d2c6c 100644
--- a/update_fdroid_mirror_repo_from_main.cmd
+++ b/update_fdroid_mirror_repo_from_main.cmd
@@ -6,7 +6,7 @@ cls
 title Syncthing-Fork - Update F-Droid Mirror Repo from main
 REM
 REM Runtime Variables.
-SET APP_BUILD_GRADLE=%~dps0app\build.gradle
+SET APP_BUILD_GRADLE=%~dps0app\build.gradle.kts
 REM
 call :runGit fetch --all
 REM
@@ -20,7 +20,7 @@ echo [INFO] VERSION_NAME=[%VERSION_NAME%]
 echo [INFO] VERSION_CODE=[%VERSION_CODE%]
 REM
 REM Write "versionName" and "versionCode" to "build.gradle".
-TYPE "%APP_BUILD_GRADLE%" 2>NUL: | psreplace "\sversionCode .*" " versionCode %VERSION_CODE%" | psreplace "\sversionName .*" " versionName `%VERSION_NAME%`" "%APP_BUILD_GRADLE%"
+TYPE "%APP_BUILD_GRADLE%" 2>NUL: | psreplace "\sversionCode = .*" " versionCode = %VERSION_CODE%" | psreplace "\sversionName = .*" " versionName = `%VERSION_NAME%`" "%APP_BUILD_GRADLE%"
 REM
 goto :eof
 
@@ -40,30 +40,30 @@ REM ====================
 REM
 REM Get "applicationId"
 SET APPLICATION_ID=
-FOR /F "tokens=2 delims= " %%A IN ('type "%SCRIPT_PATH%app\build.gradle" 2^>^&1 ^| findstr "applicationId"') DO SET APPLICATION_ID=%%A
+FOR /F "tokens=3 delims=) " %%A IN ('type "%SCRIPT_PATH%app\build.gradle.kts" 2^>^&1 ^| findstr "applicationId"') DO SET APPLICATION_ID=%%A
 SET APPLICATION_ID=%APPLICATION_ID:"=%
 REM
 REM Get "versionMajor"
 SET VERSION_MAJOR=
-FOR /F "tokens=2 delims== " %%A IN ('type "%SCRIPT_PATH%app\versions.gradle" 2^>^&1 ^| findstr "versionMajor"') DO SET VERSION_MAJOR=%%A
+FOR /F "tokens=2 delims==) " %%A IN ('type "%SCRIPT_PATH%build.gradle.kts" 2^>^&1 ^| findstr "versionMajor"') DO SET VERSION_MAJOR=%%A
 SET VERSION_MAJOR=%VERSION_MAJOR:"=%
 REM echo [INFO] versionMajor="%VERSION_MAJOR%"
 REM
 REM Get "versionMinor"
 SET VERSION_MINOR=
-FOR /F "tokens=2 delims== " %%A IN ('type "%SCRIPT_PATH%app\versions.gradle" 2^>^&1 ^| findstr "versionMinor"') DO SET VERSION_MINOR=%%A
+FOR /F "tokens=2 delims==) " %%A IN ('type "%SCRIPT_PATH%build.gradle.kts" 2^>^&1 ^| findstr "versionMinor"') DO SET VERSION_MINOR=%%A
 SET VERSION_MINOR=%VERSION_MINOR:"=%
 REM echo [INFO] versionMinor="%VERSION_MINOR%"
 REM
 REM Get "versionPatch"
 SET VERSION_PATCH=
-FOR /F "tokens=2 delims== " %%A IN ('type "%SCRIPT_PATH%app\versions.gradle" 2^>^&1 ^| findstr "versionPatch"') DO SET VERSION_PATCH=%%A
+FOR /F "tokens=2 delims==) " %%A IN ('type "%SCRIPT_PATH%build.gradle.kts" 2^>^&1 ^| findstr "versionPatch"') DO SET VERSION_PATCH=%%A
 SET VERSION_PATCH=%VERSION_PATCH:"=%
 REM echo [INFO] versionPatch="%VERSION_PATCH%"
 REM
 REM Get "versionWrapper"
 SET VERSION_WRAPPER=
-FOR /F "tokens=2 delims== " %%A IN ('type "%SCRIPT_PATH%app\versions.gradle" 2^>^&1 ^| findstr "versionWrapper"') DO SET VERSION_WRAPPER=%%A
+FOR /F "tokens=2 delims==) " %%A IN ('type "%SCRIPT_PATH%build.gradle.kts" 2^>^&1 ^| findstr "versionWrapper"') DO SET VERSION_WRAPPER=%%A
 SET VERSION_WRAPPER=%VERSION_WRAPPER:"=%
 REM echo [INFO] versionWrapper="%VERSION_WRAPPER%"
 REM