version 0.108

Not compatible with F-Droid.

If you can fix F-Droid builds, send pull requests. For now I'm disabling this.

This reverts commit a7eb173178.

.github/workflows/publish_libraries.yml

@@ -0,0 +1,25 @@
+name: Publish library packages
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - 'terminal-emulator/build.gradle'
+    - 'terminal-view/build.gradle'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+    - name: Perform release build
+      run: |
+        ./gradlew assembleRelease
+    - name: Publish libraries on Github Packages
+      env:
+        GH_USERNAME: xeffyr
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      run: |
+        ./gradlew publish

app/build.gradle

@@ -17,22 +17,17 @@ android {
         applicationId "com.termux"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 107
+        versionCode 108
-        versionName "0.107"
+        versionName "0.108"
 
         externalNativeBuild {
             ndkBuild {
                 cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
             }
         }
-    }
 
-    splits {
+        ndk {
-        abi {
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-            enable true
-
-            reset ()
-            include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
 
     }
@@ -91,7 +86,7 @@ task versionName {
   }
 }
 
-def downloadBootstrap(String arch, String expectedChecksum, int version) {
+def downloadBootstrap(String arch, String expectedChecksum, String version) {
     def digest = java.security.MessageDigest.getInstance("SHA-256")
 
     def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
@@ -113,7 +108,7 @@ def downloadBootstrap(String arch, String expectedChecksum, int version) {
         }
     }
 
-    def remoteUrl = "https://bintray.com/termux/bootstrap/download_file?file_path=bootstrap-" + arch + "-v" + version + ".zip"
+    def remoteUrl = "https://github.com/termux/termux-packages/releases/download/bootstrap-" + version + "/bootstrap-" + arch + ".zip"
     logger.quiet("Downloading " + remoteUrl + " ...")
 
     file.parentFile.mkdirs()
@@ -142,11 +137,11 @@ clean {
 
 task downloadBootstraps(){
     doLast {
-        def version = 36
+        def version = "2021.02.19-r1"
-        downloadBootstrap("aarch64", "9b1ee77b3e66bbb5e0ec9d766894aa9c1441f68b2bd4152e3ea54101de3c76d5", version)
+        downloadBootstrap("aarch64", "1e3d80bd8cc8771715845ab4a1e67fc125d84c4deda3a1a435116fe4d1f86160", version)
-        downloadBootstrap("arm",     "eac7c2b322a1217f28a2b540afe4f994147abee571e9fed330d5430b08d6707b", version)
+        downloadBootstrap("arm",     "317a987cab3d4da6f9d42f024a5f25e3aaf8557b8ec68eaf80411fde6b8ea78d", version)
-        downloadBootstrap("i686",    "990dd1aaf5b6499bee5ed473dd5a0e18ecbc0493646b299238ac0dd0d9963396", version)
+        downloadBootstrap("i686",    "dd4632350474058fe5dec14b7bd882798bb3e9fe738b2de8c84a51a0b6395f4b", version)
-        downloadBootstrap("x86_64",  "a321eba39c4bb0fb2aa35f17ccff57bf8fcf0e973b0a0569f6d24bd02314e4ed", version)
+        downloadBootstrap("x86_64",  "5458119186c3ea631420833e59730461dc2a5faf17b8fad239823c88aa4569ae", version)
     }
 }
 

scripts/bintray-publish.gradle

@@ -1,77 +0,0 @@
-// Start https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle
-group = publishedGroupId // Maven Group ID for the artifact
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                groupId publishedGroupId
-                artifactId artifact
-
-                name libraryName
-                description libraryDescription
-                url siteUrl
-
-                licenses {
-                    license {
-                        name 'GNU General Public License version 3'
-                        url 'https://opensource.org/licenses/gpl-3.0.html'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id 'fornwall'
-                        name 'Fredrik Fornwall'
-                        email 'fredrik@fornwall.net'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
-// End https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle
-
-// Start https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle
-apply plugin: 'com.jfrog.bintray'
-
-version = libraryVersion
-
-task sourcesJar(type: Jar) {
-	classifier = 'sources'
-	from android.sourceSets.main.java.srcDirs
-}
-
-artifacts {
-	archives sourcesJar
-}
-
-bintray {
-	user = System.getenv('BINTRAY_USER')
-	key = System.getenv('BINTRAY_API_KEY')
-
-	configurations = ['archives']
-	pkg {
-		repo = 'maven'
-		name = bintrayName
-		userOrg = 'termux'
-		desc = libraryDescription
-		websiteUrl = siteUrl
-		vcsUrl = gitUrl
-		licenses = ['GPL-3.0']
-		publish = true
-		publicDownloadNumbers = true
-		version {
-			desc = libraryDescription
-			gpg {
-				sign = false //Determines whether to GPG sign the files. The default is false
-				// passphrase = properties.getProperty("bintray.gpg.password")
-			}
-		}
-	}
-}

terminal-emulator/build.gradle

@@ -1,20 +1,5 @@
-plugins {
-    id "com.jfrog.bintray" version "1.8.5"
-    id "com.github.dcendents.android-maven" version "2.1"
-}
-
 apply plugin: 'com.android.library'
-
+apply plugin: 'maven-publish'
-ext {
-    bintrayName = 'terminal-emulator'
-    publishedGroupId = 'com.termux'
-    libraryName = 'TerminalEmulator'
-    artifact = 'terminal-emulator'
-    libraryDescription = 'The terminal emulator used in Termux'
-    siteUrl = 'https://github.com/termux/termux-app'
-    gitUrl = 'https://github.com/termux/termux-app.git'
-    libraryVersion = '0.106'
-}
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
@@ -68,4 +53,26 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
 }
 
-apply from: '../scripts/bintray-publish.gradle'
+
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId 'com.termux'
+            artifactId 'terminal-emulator'
+            version '0.106.1'
+            artifact("$buildDir/outputs/aar/terminal-emulator-release.aar")
+        }
+    }
+ 
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/termux/termux-app")
+
+            credentials {
+                username = System.getenv("GH_USERNAME")
+                password = System.getenv("GH_TOKEN")
+            }
+        }
+    }
+}

terminal-view/build.gradle

@@ -1,20 +1,5 @@
-plugins {
-    id "com.jfrog.bintray" version "1.8.5"
-    id "com.github.dcendents.android-maven" version "2.1"
-}
-
 apply plugin: 'com.android.library'
-
+apply plugin: 'maven-publish'
-ext {
-    bintrayName = 'terminal-view'
-    publishedGroupId = 'com.termux'
-    libraryName = 'TerminalView'
-    artifact = 'terminal-view'
-    libraryDescription = 'The terminal view used in Termux'
-    siteUrl = 'https://github.com/termux/termux-app'
-    gitUrl = 'https://github.com/termux/termux-app.git'
-    libraryVersion = '0.106'
-}
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
@@ -47,4 +32,25 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
 }
 
-apply from: '../scripts/bintray-publish.gradle'
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId 'com.termux'
+            artifactId 'terminal-view'
+            version '0.106.1'
+            artifact("$buildDir/outputs/aar/terminal-view-release.aar")
+        }
+    }
+ 
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/termux/termux-app")
+
+            credentials {
+                username = System.getenv("GH_USERNAME")
+                password = System.getenv("GH_TOKEN")
+            }
+        }
+    }
+}