chore: clean up build system, remove kotlin-android plugin, drop apt-android-5, fix AndroidManifest

Author: Workbench

.github/workflows/attach_debug_apks_to_release.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_variant: [ apt-android-7, apt-android-5 ]
+        package_variant: [ apt-android-7 ]
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/debug_build.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_variant: [ apt-android-7, apt-android-5 ]
+        package_variant: [ apt-android-7 ]
 
     steps:
       - name: Clone repository

app/build.gradle

@@ -1,12 +1,16 @@
-import java.security.DigestInputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-
 plugins {
     id "com.android.application"
 }
-apply plugin: 'kotlin-android'
+
+ext {
+    // The packageVariant defines the bootstrap variant that will be included in the app APK.
+    // This must be supported by com.termux.shared.termux.TermuxBootstrap.PackageVariant or app will
+    // crash at startup.
+    // Bootstrap of a different variant must not be manually installed by the user after app installation
+    // by replacing $PREFIX since app code is dependant on the variant used to build the APK.
+    // Currently supported values are: [ "apt-android-7" "apt-android-5" ]
+    packageVariant = System.getenv("TERMUX_PACKAGE_VARIANT") ?: "apt-android-7" // Default: "apt-android-7"
+}
 
 android {
     namespace "com.termux"
@@ -37,20 +41,39 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.termux"
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 83
-        versionName "0.83"
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
+        versionCode 118
+        versionName "0.118.0"
+
+        if (appVersionName) versionName = appVersionName
+        validateVersionName(versionName)
+
+        buildConfigField "String", "TERMUX_PACKAGE_VARIANT", "\"" + project.ext.packageVariant + "\"" // Used by TermuxApplication class
+
+        manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
+        manifestPlaceholders.TERMUX_APP_NAME = "Termux"
+        manifestPlaceholders.TERMUX_API_APP_NAME = "Termux:API"
+        manifestPlaceholders.TERMUX_BOOT_APP_NAME = "Termux:Boot"
+        manifestPlaceholders.TERMUX_FLOAT_APP_NAME = "Termux:Float"
+        manifestPlaceholders.TERMUX_STYLING_APP_NAME = "Termux:Styling"
+        manifestPlaceholders.TERMUX_TASKER_APP_NAME = "Termux:Tasker"
+        manifestPlaceholders.TERMUX_WIDGET_APP_NAME = "Termux:Widget"
 
         externalNativeBuild {
             ndkBuild {
                 cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
             }
         }
 
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        splits {
+            abi {
+                enable ((gradle.startParameter.taskNames.any { it.contains("Debug") } && splitAPKsForDebugBuilds == "1") ||
+                    (gradle.startParameter.taskNames.any { it.contains("Release") } && splitAPKsForReleaseBuilds == "1"))
+                reset ()
+                include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+                universalApk true
+            }
         }
     }
 
@@ -82,8 +105,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/cpp/Android.mk"
+        }
     }
 
     lint {
@@ -120,15 +146,9 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
-
-    //kotlin
-    implementation "androidx.core:core-ktx:1.3.2"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
-
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.robolectric:robolectric:4.10"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 
 task versionName {
@@ -137,117 +157,87 @@ task versionName {
     }
 }
 
-def setupBootstrap(String arch, String expectedChecksum, int version) {
-    def digest = java.security.MessageDigest.getInstance("SHA-256")
+def validateVersionName(String versionName) {
+    // https://semver.org/spec/v2.0.0.html#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+    // ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+    if (!java.util.regex.Pattern.matches("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?\$", versionName))
+        throw new GradleException("The versionName '"  + versionName + "' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html.")
+}
 
-    def zipDownloadFile = new File(project.buildDir, "./gradle/bootstrap-" + arch + "-" + version + ".zip")
+def downloadBootstrap(String arch, String expectedChecksum, String version) {
+    def digest = java.security.MessageDigest.getInstance("SHA-256")
 
-    if (zipDownloadFile.exists()) {
+    def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
+    def file = new File(projectDir, localUrl)
+    if (file.exists()) {
         def buffer = new byte[8192]
-        def input = new FileInputStream(zipDownloadFile)
+        def input = new FileInputStream(file)
         while (true) {
             def readBytes = input.read(buffer)
             if (readBytes < 0) break
             digest.update(buffer, 0, readBytes)
         }
         def checksum = new BigInteger(1, digest.digest()).toString(16)
-        if (checksum != expectedChecksum) {
-            logger.quiet("Deleting old local file with wrong hash: " + zipDownloadFile.getAbsolutePath())
-            zipDownloadFile.delete()
+        while (checksum.length() < 64) { checksum = "0" + checksum }
+        if (checksum == expectedChecksum) {
+            return
+        } else {
+            logger.quiet("Deleting old local file with wrong hash: " + localUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
+            file.delete()
         }
     }
 
-    if (!zipDownloadFile.exists()) {
-        def remoteUrl = "https://bintray.com/termux/bootstrap/download_file?file_path=android10-v" + version + "-bootstrap-" + arch + ".zip"
-        logger.quiet("Downloading " + remoteUrl + " ...")
+    def remoteUrl = "https://github.com/termux/termux-packages/releases/download/bootstrap-" + version + "/bootstrap-" + arch + ".zip"
+    logger.quiet("Downloading " + remoteUrl + " ...")
 
-        zipDownloadFile.parentFile.mkdirs()
-        def out = new BufferedOutputStream(new FileOutputStream(zipDownloadFile))
+    file.parentFile.mkdirs()
+    def out = new BufferedOutputStream(new FileOutputStream(file))
 
-        def connection = new URL(remoteUrl).openConnection()
-        connection.setInstanceFollowRedirects(true)
-        def digestStream = new DigestInputStream(connection.inputStream, digest)
-        out << digestStream
-        out.close()
+    def connection = new URL(remoteUrl).openConnection()
+    connection.setInstanceFollowRedirects(true)
+    def digestStream = new java.security.DigestInputStream(connection.inputStream, digest)
+    out << digestStream
+    out.close()
 
-        def checksum = new BigInteger(1, digest.digest()).toString(16)
-        if (checksum != expectedChecksum) {
-            zipDownloadFile.delete()
-            throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
-        }
+    def checksum = new BigInteger(1, digest.digest()).toString(16)
+    while (checksum.length() < 64) { checksum = "0" + checksum }
+    if (checksum != expectedChecksum) {
+        file.delete()
+        throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
     }
+}
 
-    def doneMarkerFile = new File(zipDownloadFile.getAbsolutePath() + "." + expectedChecksum + ".done")
-
-    if (doneMarkerFile.exists()) return
-
-    def archDirName
-    if (arch == "aarch64") archDirName = "arm64-v8a";
-    if (arch == "arm") archDirName = "armeabi-v7a";
-    if (arch == "i686") archDirName = "x86";
-    if (arch == "x86_64") archDirName = "x86_64";
-
-    def outputPath = project.getRootDir().getAbsolutePath() + "/app/src/main/jniLibs/" + archDirName + "/"
-    def outputDir = new File(outputPath).getAbsoluteFile()
-    if (!outputDir.exists()) outputDir.mkdirs()
-
-    def symlinksFile = new File(outputDir, "libsymlinks.so").getAbsoluteFile()
-    if (symlinksFile.exists()) symlinksFile.delete();
-
-    def mappingsFile = new File(outputDir, "libfiles.so").getAbsoluteFile()
-    if (mappingsFile.exists()) mappingsFile.delete()
-    mappingsFile.createNewFile()
-    def mappingsFileWriter = new BufferedWriter(new FileWriter(mappingsFile))
-
-    def counter = 100
-    new ZipInputStream(new FileInputStream(zipDownloadFile)).withCloseable { zipInput ->
-        ZipEntry zipEntry
-        while ((zipEntry = zipInput.getNextEntry()) != null) {
-            if (zipEntry.getName() == "SYMLINKS.txt") {
-                zipInput.transferTo(new FileOutputStream(symlinksFile))
-            } else if (!zipEntry.isDirectory()) {
-                def soName = "lib" + counter + ".so"
-                def targetFile = new File(outputDir, soName).getAbsoluteFile()
-
-                println "target file path is ${targetFile}"
-
-                try {
-                    zipInput.transferTo(new FileOutputStream(targetFile))
-                } catch (Exception e) {
-                    println "Error ${e}"
-                }
-
-
-                if (zipEntry.getName().endsWith("/pkg")) {
-                    def pkgScript = new FileInputStream(project.getRootDir().getAbsolutePath() + "/pkg.sh")
-                    pkgScript.transferTo(new FileOutputStream(targetFile))
-                }
-
-                mappingsFileWriter.writeLine(soName + "←" + zipEntry.getName())
-                counter++
-            }
-        }
+clean {
+    doLast {
+        def tree = fileTree(new File(projectDir, 'src/main/cpp'))
+        tree.include 'bootstrap-*.zip'
+        tree.each { it.delete() }
     }
-
-    mappingsFileWriter.close()
-    doneMarkerFile.createNewFile()
 }
 
-task setupBootstraps() {
+task downloadBootstraps() {
     doLast {
-        def version = 12
-        setupBootstrap("aarch64", "5e07239cad78050f56a28f9f88a0b485cead45864c6c00e1a654c728152b0244", version)
-        setupBootstrap("arm", "fc72279c480c1eea46b6f0fcf78dc57599116c16dcf3b2b970a9ef828f0ec30b", version)
-        setupBootstrap("i686", "895680fc967aecfa4ed77b9dc03aab95d86345be69df48402c63bfc0178337f6", version)
-        setupBootstrap("x86_64", "8714ab8a5ff4e1f5f3ec01e7d0294776bfcffb187c84fa95270ec67ede8f682e", version)
+        def packageVariant = project.ext.packageVariant
+        if (packageVariant == "apt-android-7") {
+            def version = "2026.02.12-r1" + "%2B" + "apt.android-7"
+            downloadBootstrap("aarch64", "ea2aeba8819e517db711f8c32369e89e7c52cee73e07930ff91185e1ab93f4f3", version)
+            downloadBootstrap("arm", "a38f4d3b2f735f83be2bf54eff463e86dc32a3e2f9f861c1557c4378d249c018", version)
+            downloadBootstrap("i686", "f5bc0b025b9f3b420b5fcaeefc064f888f5f22a0d6fd7090f4aac0c33eb3555b", version)
+            downloadBootstrap("x86_64", "b7fd0f2e3a4de534be3144f9f91acc768630fc463eaf134ab2e64c545e834f7a", version)
+        } else if (packageVariant == "apt-android-5") {
+            def version = "2022.04.28-r6" + "+" + packageVariant
+            downloadBootstrap("aarch64", "913609d439415c828c5640be1b0561467e539cb1c7080662decaaca2fb4820e7", version)
+            downloadBootstrap("arm", "26bfb45304c946170db69108e5eb6e3641aad751406ce106c80df80cad2eccf8", version)
+            downloadBootstrap("i686", "46dcfeb5eef67ba765498db9fe4c50dc4690805139aa0dd141a9d8ee0693cd27", version)
+            downloadBootstrap("x86_64", "615b590679ee6cd885b7fd2ff9473c845e920f9b422f790bb158c63fe42b8481", version)
+        } else {
+            throw new GradleException("Unsupported TERMUX_PACKAGE_VARIANT \"" + packageVariant + "\"")
+        }
     }
 }
 
 afterEvaluate {
     android.applicationVariants.all { variant ->
-        variant.javaCompileProvider.get().dependsOn(setupBootstraps)
+        variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
     }
 }
-repositories {
-    mavenCentral()
-}

app/src/main/AndroidManifest.xml

@@ -36,12 +36,9 @@
         android:maxSdkVersion="29" />
 
     <application
-        android:extractNativeLibs="true"
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:banner="@drawable/banner"
-        android:extractNativeLibs="true"
-        android:icon="@drawable/ic_launcher"
         android:label="@string/application_name"
         android:supportsRtl="false"
         android:theme="@style/Theme.Termux"

build.gradle

@@ -1,17 +1,14 @@
-
-
 buildscript {
-    ext.kotlin_version = '1.4.0'
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath "com.android.tools.build:gradle:8.13.2"
     }
 }
 
-allprojects {
+allprojects{
     repositories {
         google()
         mavenCentral()