(legacy) Use tor-wrapper legacy lib 0.0.6

The build instructions have been updated, as well as the
docker and CI builds. This upgrade lets us use jdk 17.

Author: dpad85

.github/workflows/testnet-build.yml

@@ -78,10 +78,10 @@ jobs:
     - name: Build Tor_Onion_Proxy_Library and install to local maven repo
       run: |
         cd tor-lib
-        ./gradlew install
         ./gradlew :universal:build
+        ./gradlew :universal:publishToMavenLocal
         ./gradlew :android:build
-        ./gradlew :android:publishToMaven
+        ./gradlew :android:publishToMavenLocal
 
     - name: Assemble new android app apk
       run: |

Dockerfile

@@ -1,5 +1,5 @@
 # base image to build eclair-core
-FROM eclipse-temurin:11.0.21_9-jdk-alpine as ECLAIR_CORE_BUILD
+FROM eclipse-temurin:17.0.10_7-jdk-alpine as ECLAIR_CORE_BUILD
 
 # this is necessary to extract the eclair-core version that we need to clone for the build
 COPY ./buildSrc/src/main/kotlin/Versions.kt .
@@ -69,10 +69,10 @@ RUN echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;${AN
 # build tor library
 RUN git clone https://github.com/ACINQ/Tor_Onion_Proxy_Library && \
     cd Tor_Onion_Proxy_Library && \
-    ./gradlew install && \
     ./gradlew :universal:build && \
+    ./gradlew :universal:publishToMavenLocal && \
     ./gradlew :android:build && \
-    ./gradlew :android:publishToMaven
+    ./gradlew :android:publishToMavenLocal
 
 # copy eclair-core dependency
 COPY --from=ECLAIR_CORE_BUILD /root/.m2/repository/fr/acinq/eclair /root/.m2/repository/fr/acinq/eclair

buildSrc/src/main/kotlin/Versions.kt

@@ -46,7 +46,7 @@ object Versions {
         const val work = "2.8.1"
         const val viewpager = "1.0.0"
         const val eventbus = "3.1.1"
-        const val torWrapper = "0.0.5"
+        const val torWrapper = "0.0.6"
         const val torCtl = "0.4"
     }
 }

phoenix-android/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:hardwareAccelerated="true"
+        android:extractNativeLibs="true"
         android:theme="@style/default_theme"
         android:localeConfig="@xml/locales_config">
 

phoenix-android/src/main/res/values-b+es+419/strings.xml

@@ -699,7 +699,6 @@
     <string name="splice_error_nochannels">No tienes ningún canal</string>
     <string name="splice_error_aborted_by_peer">Abortado por el par [%1$s]</string>
     <string name="splice_error_cannot_create_commit">No se puede crear un nuevo compromiso</string>
-    <string name="splice_error_channel_not_idle">El canal no está disponible</string>
     <string name="splice_error_disconnected">El canal está desconectado</string>
     <string name="splice_error_funding_error">Error de fondos [%1$s]</string>
     <string name="splice_error_insufficient_funds">Fondos insuficientes</string>

phoenix-android/src/main/res/values-cs/strings.xml

@@ -658,7 +658,6 @@
     <string name="splice_error_nochannels">Nemáte žádné kanály</string>
     <string name="splice_error_aborted_by_peer">Prerušeno peerem [%1$s]</string>
     <string name="splice_error_cannot_create_commit">Nelze vytvořit nový commitment</string>
-    <string name="splice_error_channel_not_idle">Kanál není dostupný</string>
     <string name="splice_error_disconnected">Kanál je odpojený</string>
     <string name="splice_error_funding_error">Financování selhalo [%1$s]</string>
     <string name="splice_error_insufficient_funds">Nedostatek prostředků</string>

phoenix-android/src/main/res/values-de/strings.xml

@@ -646,7 +646,6 @@
     <string name="splice_error_nochannels">Sie haben keine Kanäle</string>
     <string name="splice_error_aborted_by_peer">Abbruch durch Gegenstelle [%1$s]</string>
     <string name="splice_error_cannot_create_commit">Es kann keine neue Commitment erstellt werden</string>
-    <string name="splice_error_channel_not_idle">Kanal ist nicht verfügbar</string>
     <string name="splice_error_disconnected">Kanal ist nicht verbunden</string>
     <string name="splice_error_funding_error">Funding ist fehlgeschlagen [%1$s]</string>
     <string name="splice_error_insufficient_funds">Kein ausreichendes Guthaben</string>

phoenix-legacy/BUILD.md

@@ -21,8 +21,9 @@ Phoenix uses a library to manage the communication with the tor binary. This lib
 ```shell
 ./gradlew install
 ./gradlew :universal:build
+./gradlew :universal:publishToMavenLocal
 ./gradlew :android:build
-./gradlew :android:publishToMaven
+./gradlew :android:publishToMavenLocal
 ```
 
 ## Troubleshooting