Merge branch 'master' of https://github.com/hsjoberg/blixt-wallet

hsjoberg · Sep 26, 2024 · 7819b6f · 7819b6f
2 parents e4858a6 + 6818b0f
commit 7819b6f
Show file tree

Hide file tree

Showing 51 changed files with 23,708 additions and 17,703 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,7 @@
 module.exports = {
   root: true,
-  extends: '@react-native',
+  extends: "@react-native",
+  rules: {
+    quotes: "off",
+  },
 };
diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -1,11 +1,15 @@
 name: Build Android
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "The branch to build"
+        required: true
+    permissions:
+      users:
+        - hsjoberg
+        - niteshbalusu11
+        - djkazic
 
 jobs:
   build-android:

diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,11 +1,3 @@
-// module.exports = {
-//   arrowParens: 'avoid',
-//   bracketSameLine: true,
-//   bracketSpacing: false,
-//   singleQuote: true,
-//   trailingComma: 'all',
-// };
-
 module.exports = {
   trailingComma: "all",
   tabWidth: 2,

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.7.4)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -63,10 +63,10 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
-    minitest (5.18.1)
+    minitest (5.25.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -85,14 +85,14 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.3, < 7.1.0)
-  cocoapods (~> 1.13)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
 
 RUBY VERSION
    ruby 2.6.10p210

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -11,14 +11,14 @@ apply plugin: "com.google.protobuf"
  */
 react {
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
+    // reactNativeDir = file("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
+    // cliFile = file("../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -52,6 +52,7 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -82,8 +83,8 @@ android {
         applicationId "com.blixtwallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 162
-        versionName "0.7.0-alpha6"
+        versionCode 163
+        versionName "0.7.0"
 
         // Blixt:
         buildConfigField "String", "CHAIN", '"mainnet"'
@@ -223,9 +224,6 @@ dependencies {
     }
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
-
 // Blixt:
 protobuf {
     protoc {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
       android:theme="@style/AppTheme"
       android:usesCleartextTraffic="true"
       tools:replace="android:label"
+      android:supportsRtl="true"
   >
       <!--activity
         android:name=".MainActivity"

diff --git a/android/app/src/main/java/com/blixtwallet/LndMobileScheduledSyncWorker.java b/android/app/src/main/java/com/blixtwallet/LndMobileScheduledSyncWorker.java
@@ -26,6 +26,7 @@
 import androidx.work.WorkerParameters;
 
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.BridgeReactContext;
 import com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier;
 import com.reactnativecommunity.asyncstorage.AsyncLocalStorageUtil;
 import com.facebook.react.bridge.Arguments;
@@ -72,7 +73,7 @@ public class LndMobileScheduledSyncWorker extends ListenableWorker {
   public LndMobileScheduledSyncWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
     super(context, workerParams);
     dbSupplier = ReactDatabaseSupplier.getInstance(getApplicationContext());
-    blixtTor = new BlixtTor(new ReactApplicationContext(getApplicationContext()));
+    blixtTor = new BlixtTor(new BridgeReactContext(getApplicationContext()));
   }
 
   @Override
@@ -93,7 +94,7 @@ public ListenableFuture<Result> startWork() {
         return null;
       }
 
-      KeychainModule keychain = new KeychainModule(new ReactApplicationContext(getApplicationContext()));
+      KeychainModule keychain = new KeychainModule(new BridgeReactContext(getApplicationContext()));
 
       WritableMap keychainOptions = Arguments.createMap();
       WritableMap keychainOptionsAuthenticationPrompt = Arguments.createMap();

diff --git a/android/build.gradle b/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
         // reaniamted fix https://github.com/software-mansion/react-native-reanimated/issues/5625
         // ndkVersion = "23.1.7779620"
-        kotlinVersion = "1.9.22"
+        kotlinVersion = "1.9.24"
     }
     repositories {
         google()

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -42,5 +42,5 @@ newArchEnabled=false
 hermesEnabled=true
 
 # We don't use Kotlin, but we'll mandate this version for all react-native libs
-kotlinVersion=1.8.20
-kotlin_version=1.8.20
+kotlinVersion=1.9.24
+kotlin_version=1.9.24
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,4 +1,6 @@
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'BlixtWallet'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
diff --git a/fetch_libraries.sh b/fetch_libraries.sh
@@ -1,8 +1,8 @@
-VERSION=v0.18.0-beta-blixt
+VERSION=v0.18.2-beta-blixt
 
 ANDROID_FILE=Lndmobile.aar
 
-ANDROID_SHA256='c0f8e77da00795a370ef2a1c5ba9d413707c52226c33c2ef1e272007c2f30149'
+ANDROID_SHA256='fd392400f80f1e91beac0dd926350119df50f30324c01e134a7afff1deadaee0'
 
 FILE_PATH=https://github.com/hsjoberg/lnd/releases/download/$VERSION/