Skip to content

Commit 577c479

Browse files
hsjoberghsjoberg
committed
React Native 0.75
1 parent 5bcdb43 commit 577c479

29 files changed

+21075
-16844
lines changed

‎Gemfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

‎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.1, != 1.15.0)
9696

9797
RUBY VERSION
9898
ruby 2.6.10p210

‎android/app/build.gradle

+9-11
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ apply plugin: "com.google.protobuf"
1111
*/
1212
react {
1313
/* Folders */
14-
// The root of your project, i.e. where "package.json" lives. Default is '..'
15-
// root = file("../")
16-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
17-
// reactNativeDir = file("../node_modules/react-native")
18-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
19-
// codegenDir = file("../node_modules/@react-native/codegen")
20-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
21-
// cliFile = file("../node_modules/react-native/cli.js")
14+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
15+
// root = file("../../")
16+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
17+
// reactNativeDir = file("../../node_modules/react-native")
18+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
19+
// codegenDir = file("../../node_modules/@react-native/codegen")
20+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
21+
// cliFile = file("../../node_modules/react-native/cli.js")
2222

2323
/* Variants */
2424
// The list of variants to that are debuggable. For those we're going to
@@ -52,6 +52,7 @@ react {
5252
//
5353
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5454
// hermesFlags = ["-O", "-output-source-map"]
55+
autolinkLibrariesWithApp()
5556
}
5657

5758
/**
@@ -223,9 +224,6 @@ dependencies {
223224
}
224225
}
225226

226-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
227-
228-
229227
// Blixt:
230228
protobuf {
231229
protoc {

‎android/app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
android:theme="@style/AppTheme"
2929
android:usesCleartextTraffic="true"
3030
tools:replace="android:label"
31+
android:supportsRtl="true"
3132
>
3233
<!--activity
3334
android:name=".MainActivity"

‎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();

‎android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313

1414
// reaniamted fix https://github.com/software-mansion/react-native-reanimated/issues/5625
1515
// ndkVersion = "23.1.7779620"
16-
kotlinVersion = "1.9.22"
16+
kotlinVersion = "1.9.24"
1717
}
1818
repositories {
1919
google()

‎android/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ newArchEnabled=false
4242
hermesEnabled=true
4343

4444
# We don't use Kotlin, but we'll mandate this version for all react-native libs
45-
kotlinVersion=1.8.20
46-
kotlin_version=1.8.20
45+
kotlinVersion=1.9.24
46+
kotlin_version=1.9.24

‎android/gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎android/settings.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
2+
plugins { id("com.facebook.react.settings") }
3+
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
14
rootProject.name = 'BlixtWallet'
2-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
35
include ':app'
46
includeBuild('../node_modules/@react-native/gradle-plugin')

‎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;

‎ios/BlixtWallet.xcodeproj/xcshareddata/xcschemes/BlixtWalletRegtest.xcscheme

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1210"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
18+
BuildableName = "Blixt Wallet.app"
19+
BlueprintName = "BlixtWallet"
20+
ReferencedContainer = "container:BlixtWallet.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "DebugRegtest"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
36+
BuildableName = "BlixtWalletTests.xctest"
37+
BlueprintName = "BlixtWalletTests"
38+
ReferencedContainer = "container:BlixtWallet.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "DebugRegtest"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "NO"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
<BuildableProductRunnable
54+
runnableDebuggingMode = "0">
55+
<BuildableReference
56+
BuildableIdentifier = "primary"
57+
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
58+
BuildableName = "Blixt Wallet.app"
59+
BlueprintName = "BlixtWallet"
60+
ReferencedContainer = "container:BlixtWallet.xcodeproj">
61+
</BuildableReference>
62+
</BuildableProductRunnable>
63+
</LaunchAction>
64+
<ProfileAction
65+
buildConfiguration = "ReleaseRegtest"
66+
shouldUseLaunchSchemeArgsEnv = "YES"
67+
savedToolIdentifier = ""
68+
useCustomWorkingDirectory = "NO"
69+
debugDocumentVersioning = "YES">
70+
<BuildableProductRunnable
71+
runnableDebuggingMode = "0">
72+
<BuildableReference
73+
BuildableIdentifier = "primary"
74+
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
75+
BuildableName = "Blixt Wallet.app"
76+
BlueprintName = "BlixtWallet"
77+
ReferencedContainer = "container:BlixtWallet.xcodeproj">
78+
</BuildableReference>
79+
</BuildableProductRunnable>
80+
</ProfileAction>
81+
<AnalyzeAction
82+
buildConfiguration = "DebugRegtest">
83+
</AnalyzeAction>
84+
<ArchiveAction
85+
buildConfiguration = "ReleaseRegtest"
86+
revealArchiveInOrganizer = "YES">
87+
</ArchiveAction>
88+
</Scheme>

‎ios/BlixtWallet/PrivacyInfo.xcprivacy

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyAccessedAPITypes</key>
6+
<array>
7+
<dict>
8+
<key>NSPrivacyAccessedAPIType</key>
9+
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
10+
<key>NSPrivacyAccessedAPITypeReasons</key>
11+
<array>
12+
<string>C617.1</string>
13+
</array>
14+
</dict>
15+
<dict>
16+
<key>NSPrivacyAccessedAPIType</key>
17+
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
18+
<key>NSPrivacyAccessedAPITypeReasons</key>
19+
<array>
20+
<string>CA92.1</string>
21+
</array>
22+
</dict>
23+
<dict>
24+
<key>NSPrivacyAccessedAPIType</key>
25+
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
26+
<key>NSPrivacyAccessedAPITypeReasons</key>
27+
<array>
28+
<string>35F9.1</string>
29+
</array>
30+
</dict>
31+
</array>
32+
<key>NSPrivacyCollectedDataTypes</key>
33+
<array/>
34+
<key>NSPrivacyTracking</key>
35+
<false/>
36+
</dict>
37+
</plist>

0 commit comments

Comments
 (0)