chore: release stable version

Signed-off-by: qwq233 <qwq233@qwq2333.top>
qwq233 · Jan 24, 2025 · 6cfb769 · 6cfb769
1 parent 300829b
commit 6cfb769
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,8 +69,9 @@ jobs:
             df -h
             
             sudo apt-get install bison gcc make curl ninja-build -y
-            echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+            echo "y" | sdkmanager --install "ndk;27.2.12479018" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
             echo "sdk.dir=${ANDROID_HOME}" >> local.properties
+            export ANDROID_SDK=${ANDROID_HOME}
       - name: Debug Build
         run: |
           echo -e "RELEASE_KEY_PASSWORD=${{ secrets.RELEASE_KEY_PASSWORD }}\nRELEASE_KEY_ALIAS=${{ secrets.RELEASE_KEY_ALIAS }}\nRELEASE_STORE_PASSWORD=${{ secrets.RELEASE_STORE_PASSWORD }}">>local.properties
@@ -158,8 +159,9 @@ jobs:
             df -h
             
             sudo apt-get install bison gcc make curl ninja-build -y
-            echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+            echo "y" | sdkmanager --install "ndk;27.2.12479018" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
             echo "sdk.dir=${ANDROID_HOME}" >> local.properties
+            export ANDROID_SDK=${ANDROID_HOME}
 
       - name: Debug Build
         run: |

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -68,7 +68,7 @@ jobs:
             df -h
             
             sudo apt-get install bison gcc make curl ninja-build ccache -y
-            echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+            echo "y" | sdkmanager --install "ndk;27.2.12479018" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
             echo "sdk.dir=${ANDROID_HOME}" >> local.properties
       - name: Debug Build
         run: |

diff --git a/TMessagesProj/build.gradle.kts b/TMessagesProj/build.gradle.kts
@@ -192,7 +192,6 @@ android {
     defaultConfig {
         externalNativeBuild {
             cmake {
-                version = "3.22.1"
                 arguments += listOf(
                     "-DANDROID_STL=c++_static",
                     "-DANDROID_PLATFORM=android-27",

diff --git a/TMessagesProj/jni/CMakeLists.txt b/TMessagesProj/jni/CMakeLists.txt
@@ -214,6 +214,10 @@ include(${CMAKE_HOME_DIRECTORY}/voip/CMakeLists.txt)
 
 include(${CMAKE_HOME_DIRECTORY}/integrity/CMakeLists.txt)
 
+# cpu features
+include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
+add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
+
 set(NATIVE_LIB "tmessages.49")
 
 #tmessages
@@ -525,6 +529,3 @@ target_link_libraries(${NATIVE_LIB}
 #            -Wl,--whole-archive vpxasm -Wl,--no-whole-archive
 #            c)
 #endif()
-
-include(AndroidNdkModules)
-android_ndk_import_module_cpufeatures()
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,7 +48,7 @@ val androidTargetSdkVersion by extra(35)
 val androidMinSdkVersion by extra(27)
 val androidCompileSdkVersion by extra(35)
 val androidBuildToolsVersion by extra("34.0.0")
-val androidCompileNdkVersion = "27.0.12077973"
+val androidCompileNdkVersion = "27.2.12479018"
 
 fun Project.configureBaseExtension() {
     extensions.findByType(com.android.build.gradle.BaseExtension::class)?.run {

diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt
@@ -28,5 +28,5 @@ object Version {
     val officialVersionName = "11.5.3"
 
     @JvmStatic
-    val isStable = false
+    val isStable = true
 }