Skip to content

Commit 51df7d8

Browse files
committed
deps: React Native v0.76.2
1 parent 1f39787 commit 51df7d8

19 files changed

+2334
-4711
lines changed

.eslintrc.js

-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ module.exports = {
4242
'no-unused-vars': 0,
4343
'object-shorthand': ['error', 'always'],
4444
'prefer-spread': 'off',
45-
'prettier/prettier': [
46-
'error',
47-
{
48-
endOfLine: 'auto',
49-
},
50-
],
5145
// TODO re-evaluate
5246
'dot-notation': 'off',
5347
'eqeqeq': 'off',

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ DerivedData
2323
*.hmap
2424
*.ipa
2525
*.xcuserstate
26+
ios/.xcode.env.local
2627

2728
# Android/IntelliJ
2829
#

Gemfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby ">= 2.6.10"
5+
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'
9+
gem 'xcodeproj', '< 1.26.0'

android/app/build.gradle

+11-10
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import com.android.build.OutputFile
1717
*/
1818
react {
1919
/* Folders */
20-
// The root of your project, i.e. where "package.json" lives. Default is '..'
21-
// root = file("../")
22-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
23-
// reactNativeDir = file("../node_modules/react-native")
24-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
25-
// codegenDir = file("../node_modules/@react-native/codegen")
26-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
27-
// cliFile = file("../node_modules/react-native/cli.js")
20+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
21+
// root = file("../../")
22+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
23+
// reactNativeDir = file("../../node_modules/react-native")
24+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
25+
// codegenDir = file("../../node_modules/@react-native/codegen")
26+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
27+
// cliFile = file("../../node_modules/react-native/cli.js")
2828

2929
/* Variants */
3030
// The list of variants to that are debuggable. For those we're going to
@@ -58,6 +58,9 @@ react {
5858
//
5959
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
6060
// hermesFlags = ["-O", "-output-source-map"]
61+
62+
/* Autolinking */
63+
autolinkLibrariesWithApp()
6164
}
6265

6366
/**
@@ -232,8 +235,6 @@ tasks.register('copyDownloadableDepsToLibs', Copy) {
232235
into 'libs'
233236
}
234237

235-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
236-
237238
protobuf {
238239
protoc {
239240
artifact = "com.google.protobuf:protoc:3.24.1"

android/app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
android:roundIcon="@mipmap/ic_launcher_round"
3030
android:allowBackup="false"
3131
android:theme="@style/AppTheme"
32+
android:supportsRtl="true"
3233
android:networkSecurityConfig="@xml/network_security_config"
3334
android:largeHeap="true"
3435
android:extractNativeLibs="true">

android/app/src/main/java/com/zeus/MainApplication.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.facebook.react.ReactPackage
1010
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1111
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1212
import com.facebook.react.defaults.DefaultReactNativeHost
13+
import com.facebook.react.soloader.OpenSourceMergedSoMapping
1314
import com.facebook.soloader.SoLoader
1415
import java.security.cert.X509Certificate
1516
import javax.net.ssl.X509TrustManager
@@ -45,7 +46,7 @@ class MainApplication : Application(), ReactApplication {
4546

4647
override fun onCreate() {
4748
super.onCreate()
48-
SoLoader.init(this, false)
49+
SoLoader.init(this, OpenSourceMergedSoMapping)
4950
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
5051
// If you opted-in for the New Architecture, we load the native entry point for this app.
5152
load()

android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
3+
buildToolsVersion = "35.0.0"
44
minSdkVersion = 28
5-
compileSdkVersion = 34
5+
compileSdkVersion = 35
66
targetSdkVersion = 34
77
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.22"
8+
kotlinVersion = "1.9.24"
99
}
1010
subprojects { subproject ->
1111
afterEvaluate{

android/gradle.properties

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ org.gradle.parallel=true
2323
# Android operating system, and which are packaged with your app's APK
2424
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2525
android.useAndroidX=true
26-
# Automatically convert third-party libraries to use AndroidX
27-
android.enableJetifier=true
2826

2927
# Use this property to specify which architecture you want to build.
3028
# You can also override it from the CLI using
@@ -36,7 +34,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3634
# your application. You should enable this flag either if you want
3735
# to write custom TurboModules/Fabric components OR use libraries that
3836
# are providing them.
39-
newArchEnabled=false
37+
newArchEnabled=true
4038

4139
# Use this property to enable or disable the Hermes JS engine.
4240
# If set to false, you will be using JSC instead.

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.10.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

android/gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

android/settings.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
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 = 'zeus'
2-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
35
include ':react-native-blob-util'
46
project(':react-native-blob-util').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-blob-util/android')
57
include ':react-native-gesture-handler'
68
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
79
include ':react-native-randombytes'
810
project(':react-native-randombytes').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-randombytes/android')
9-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
1011
include ':lndmobile'
1112
include ':app'
1213
includeBuild('../node_modules/@react-native/gradle-plugin')

ios/LncMobile/LncModule.mm

-13
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
#import "StreamingCallback.h"
44
#import "Lndmobile.xcframework/ios-arm64/Lndmobile.framework/Headers/Lndmobile.h"
55

6-
#ifdef RCT_NEW_ARCH_ENABLED
7-
#import "RNLncRnSpec.h"
8-
#endif
9-
106
@implementation LncModule
117
RCT_EXPORT_MODULE()
128

@@ -216,13 +212,4 @@ -(void)stopObserving {}
216212
];
217213
}
218214

219-
// Don't compile this code when we build for the old architecture.
220-
#ifdef RCT_NEW_ARCH_ENABLED
221-
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
222-
(const facebook::react::ObjCTurboModule::InitParams &)params
223-
{
224-
return std::make_shared<facebook::react::NativeLncRnSpecJSI>(params);
225-
}
226-
#endif
227-
228215
@end

ios/Podfile

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4+
# Resolve react_native_pods.rb with node to allow for hoisting
5+
require Pod::Executable.execute_command('node', ['-p',
6+
'require.resolve(
7+
"react-native/scripts/react_native_pods.rb",
8+
{paths: [process.argv[1]]},
9+
)', __dir__]).strip
10+
11+
platform :ios, min_ios_version_supported
12+
prepare_react_native_project!
13+
14+
linkage = ENV['USE_FRAMEWORKS']
15+
if linkage != nil
16+
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
17+
use_frameworks! :linkage => linkage.to_sym
18+
end
19+
420
target 'zeus' do
521
config = use_native_modules!
622

7-
823
use_react_native!(
924
:path => config[:reactNativePath],
1025
# An absolute path to your application root.

0 commit comments

Comments
 (0)