Skip to content

Commit 3311fc6

Browse files
committed
React Native 0.75
1 parent 5bcdb43 commit 3311fc6

File tree

12 files changed

+2604
-2890
lines changed

12 files changed

+2604
-2890
lines changed

Gemfile.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (6.1.7.4)
6+
activesupport (6.1.7.8)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
@@ -63,10 +63,10 @@ GEM
6363
fuzzy_match (2.0.4)
6464
gh_inspector (1.1.3)
6565
httpclient (2.8.3)
66-
i18n (1.14.1)
66+
i18n (1.14.5)
6767
concurrent-ruby (~> 1.0)
6868
json (2.7.1)
69-
minitest (5.18.1)
69+
minitest (5.25.0)
7070
molinillo (0.8.0)
7171
nanaimo (0.3.0)
7272
nap (1.1.0)
@@ -85,14 +85,14 @@ GEM
8585
colored2 (~> 3.1)
8686
nanaimo (~> 0.3.0)
8787
rexml (~> 3.2.4)
88-
zeitwerk (2.6.8)
88+
zeitwerk (2.6.17)
8989

9090
PLATFORMS
9191
ruby
9292

9393
DEPENDENCIES
94-
activesupport (>= 6.1.7.3, < 7.1.0)
95-
cocoapods (~> 1.13)
94+
activesupport (>= 6.1.7.5, < 7.1.0)
95+
cocoapods (>= 1.13, < 1.15)
9696

9797
RUBY VERSION
9898
ruby 2.6.10p210

android/app/src/main/java/com/blixtwallet/LndMobileScheduledSyncWorker.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import androidx.work.WorkerParameters;
2727

2828
import com.facebook.react.bridge.ReactApplicationContext;
29+
import com.facebook.react.bridge.BridgeReactContext;
2930
import com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier;
3031
import com.reactnativecommunity.asyncstorage.AsyncLocalStorageUtil;
3132
import com.facebook.react.bridge.Arguments;
@@ -72,7 +73,7 @@ public class LndMobileScheduledSyncWorker extends ListenableWorker {
7273
public LndMobileScheduledSyncWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
7374
super(context, workerParams);
7475
dbSupplier = ReactDatabaseSupplier.getInstance(getApplicationContext());
75-
blixtTor = new BlixtTor(new ReactApplicationContext(getApplicationContext()));
76+
blixtTor = new BlixtTor(new BridgeReactContext(getApplicationContext()));
7677
}
7778

7879
@Override
@@ -93,7 +94,7 @@ public ListenableFuture<Result> startWork() {
9394
return null;
9495
}
9596

96-
KeychainModule keychain = new KeychainModule(new ReactApplicationContext(getApplicationContext()));
97+
KeychainModule keychain = new KeychainModule(new BridgeReactContext(getApplicationContext()));
9798

9899
WritableMap keychainOptions = Arguments.createMap();
99100
WritableMap keychainOptionsAuthenticationPrompt = Arguments.createMap();

ios/BlixtWallet.xcodeproj/project.pbxproj

+1
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,7 @@
739739
OTHER_LDFLAGS = "$(inherited)";
740740
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
741741
SDKROOT = iphoneos;
742+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
742743
USE_HERMES = true;
743744
};
744745
name = Debug;

0 commit comments

Comments
 (0)