Merge pull request #1440 from CypherpunkArmory/master

Catch production releases up with beta releases

Author: corbinlc

.circleci/config.yml

@@ -258,10 +258,6 @@ jobs:
       - *android_dependencies
       - *save_cache
       - *attach_debug_workspace
-      - *attach_firebase_workspace
-      - run:
-          name: Move Firebase coverage report
-          command: mkdir -p app/build/outputs/code-coverage/connected && cp firebase/*/artifacts/sdcard/* app/build/outputs/code-coverage/connected/
       - *export_gcloud_key
       - *decode_gcloud_key
       - run:
@@ -321,21 +317,16 @@ workflows:
       - test_unit:
           requires:
             - build_debug
-      - test_instrumented:
-          requires:
-            - build_debug
       - report_coverage:
           requires:
             - test_unit
-            - test_instrumented
       - deploy-beta:
           filters:
             branches:
               only:
                 - master
           requires:
             - test_unit
-            - test_instrumented
             - build_beta_release
       - deploy-production:
           filters:
@@ -344,5 +335,4 @@ workflows:
                 - releases
           requires:
             - test_unit
-            - test_instrumented
             - build_production_release

Gemfile.lock

@@ -2,13 +2,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    addressable (2.7.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.0.3)
@@ -33,7 +33,7 @@ GEM
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     declarative (0.0.10)
     declarative-option (0.1.0)
     digest-crc (0.5.1)
@@ -121,15 +121,15 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.3.0)
     jwt (2.1.0)
     memoist (0.16.2)
     mini_magick (4.10.1)
     mini_mime (1.0.2)
-    minitest (5.14.0)
+    minitest (5.14.4)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -163,7 +163,7 @@ GEM
     tty-screen (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
@@ -181,7 +181,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode vcode
-        versionName "2.7.3"
+        versionName "2.8.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -200,7 +200,7 @@ ext.architectures = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]
 ext.libDir = "$project.projectDir/src/main/jniLibs"
 
 task downloadAssets(type: Download) {
-    def assetVersion = "v1.1.10"
+    def assetVersion = "v1.2.6"
     def baseUrl = "https://github.com/CypherpunkArmory/UserLAnd-Assets-Support/releases/download/$assetVersion"
     for (arch in architectures) {
         src "$baseUrl/$arch-assets.zip"

app/src/androidTest/java/tech/ula/ui/MainActivityTest.kt

@@ -1,12 +1,12 @@
 package tech.ula.ui
 
 import android.Manifest
-import android.content.Intent
-import android.net.Uri
+// import android.content.Intent
+// import android.net.Uri
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.intent.rule.IntentsTestRule
-import androidx.test.espresso.intent.Intents.intended
-import androidx.test.espresso.intent.matcher.IntentMatchers.* // ktlint-disable no-wildcard-imports
+// import androidx.test.espresso.intent.Intents.intended
+// import androidx.test.espresso.intent.matcher.IntentMatchers.* // ktlint-disable no-wildcard-imports
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.rule.GrantPermissionRule
@@ -125,6 +125,7 @@ class MainActivityTest {
         R.id.terminal_view.shortWaitForDisplay()
     }
 
+    /*
     @Test
     fun test_vnc_session_can_be_started() {
         R.id.app_list_fragment.shortWaitForDisplay()
@@ -176,6 +177,7 @@ class MainActivityTest {
             intended(hasFlag(Intent.FLAG_ACTIVITY_NEW_TASK))
         }
     }
+    */
 
     private fun doHappyPathTestScript(): List<File> {
         val startedFile = File(homeDirectory, "test.scriptStarted")

app/src/main/java/tech/ula/utils/BusyboxExecutor.kt

@@ -1,5 +1,6 @@
 package tech.ula.utils
 
+import android.util.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -18,7 +19,7 @@ class BusyboxExecutor(
     private val busyboxWrapper: BusyboxWrapper = BusyboxWrapper(ulaFiles)
 ) {
 
-    private val discardOutput: (String) -> Any = { }
+    private val discardOutput: (String) -> Any = { Log.d("busybox", it) }
 
     fun executeScript(
         scriptCall: String,

app/src/main/java/tech/ula/utils/UlaFiles.kt

@@ -1,6 +1,7 @@
 package tech.ula.utils
 
 import android.content.Context
+import android.os.Build
 import android.system.Os
 import java.io.File
 import java.lang.NullPointerException
@@ -65,7 +66,23 @@ class UlaFiles(
         supportDir.mkdirs()
 
         libDir.listFiles()!!.forEach { libFile ->
-            val name = libFile.name.toSupportName()
+            var libFileName = libFile.name
+            if (libFileName.startsWith("lib_proot.") ||
+                    libFileName.startsWith("lib_libtalloc") ||
+                    libFileName.startsWith("lib_loader")) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    if (libFileName.endsWith(".a10.so")) {
+                        libFileName = libFileName.replace(".a10.so", ".so")
+                    } else {
+                        return@forEach
+                    }
+                } else {
+                    if (libFileName.endsWith(".a10.so")) {
+                        return@forEach
+                    }
+                }
+            }
+            val name = libFileName.toSupportName()
             val linkFile = File(supportDir, name)
             linkFile.delete()
             symlinker.createSymlink(libFile.path, linkFile.path)