mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-02-22 15:04:50 +01:00
Merge branch 'master' into rn738
This commit is contained in:
commit
175b7ed8bc
4 changed files with 30 additions and 17 deletions
|
@ -13,15 +13,15 @@ buildscript {
|
|||
|
||||
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
|
||||
ndkVersion = "26.1.10909125"
|
||||
kotlin_version = '1.9.23'
|
||||
kotlinVersion = '1.9.23'
|
||||
kotlin_version = '1.9.25'
|
||||
kotlinVersion = '1.9.25'
|
||||
}
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("com.android.tools.build:gradle")
|
||||
classpath("com.android.tools.build:gradle:8.6.0")
|
||||
classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+")
|
||||
classpath 'com.google.gms:google-services:4.4.2' // Google Services plugin
|
||||
classpath("com.facebook.react:react-native-gradle-plugin")
|
||||
|
@ -58,12 +58,27 @@ allprojects {
|
|||
}
|
||||
|
||||
subprojects {
|
||||
afterEvaluate {project ->
|
||||
if (project.hasProperty("android")) {
|
||||
android {
|
||||
afterEvaluate { project ->
|
||||
if (project.plugins.hasPlugin("com.android.application") || project.plugins.hasPlugin("com.android.library")) {
|
||||
project.android {
|
||||
// Enable buildConfig feature
|
||||
buildFeatures {
|
||||
buildConfig = true
|
||||
}
|
||||
// Set namespace if not already set
|
||||
if (!namespace) {
|
||||
def manifestFile = android.sourceSets.main.manifest.srcFile
|
||||
if (manifestFile.exists()) {
|
||||
def manifestContent = new XmlParser().parse(manifestFile)
|
||||
def packageName = manifestContent.@package
|
||||
if (packageName) {
|
||||
namespace = packageName
|
||||
}
|
||||
}
|
||||
}
|
||||
buildToolsVersion "34.0.0"
|
||||
compileSdkVersion 34
|
||||
defaultConfig {
|
||||
defaultConfig {
|
||||
minSdkVersion 24
|
||||
}
|
||||
}
|
||||
|
@ -75,7 +90,5 @@ subprojects {
|
|||
kotlinOptions.jvmTarget = sourceCompatibility
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
apply plugin: "com.facebook.react.rootproject"
|
||||
}
|
|
@ -1293,7 +1293,7 @@ PODS:
|
|||
- React-Core
|
||||
- RNReactNativeHapticFeedback (2.2.0):
|
||||
- React-Core
|
||||
- RNReanimated (3.12.1):
|
||||
- RNReanimated (3.14.0):
|
||||
- DoubleConversion
|
||||
- glog
|
||||
- hermes-engine
|
||||
|
@ -1751,7 +1751,7 @@ SPEC CHECKSUMS:
|
|||
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
|
||||
RNRate: ef3bcff84f39bb1d1e41c5593d3eea4aab2bd73a
|
||||
RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
|
||||
RNReanimated: f9192536fa8a312c737eaf15c905f78831193ef1
|
||||
RNReanimated: f4ff116e33e0afc3d127f70efe928847c7c66355
|
||||
RNScreens: 5aeecbb09aa7285379b6e9f3c8a3c859bb16401c
|
||||
RNShare: 0fad69ae2d71de9d1f7b9a43acf876886a6cb99c
|
||||
RNSVG: a48668fd382115bc89761ce291a81c4ca5f2fd2e
|
||||
|
|
8
package-lock.json
generated
8
package-lock.json
generated
|
@ -89,7 +89,7 @@
|
|||
"react-native-quick-actions": "0.3.13",
|
||||
"react-native-randombytes": "3.6.1",
|
||||
"react-native-rate": "1.2.12",
|
||||
"react-native-reanimated": "3.12.1",
|
||||
"react-native-reanimated": "3.14.0",
|
||||
"react-native-safe-area-context": "4.10.8",
|
||||
"react-native-screens": "3.32.0",
|
||||
"react-native-secure-key-store": "https://github.com/BlueWallet/react-native-secure-key-store#2076b48",
|
||||
|
@ -19482,9 +19482,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/react-native-reanimated": {
|
||||
"version": "3.12.1",
|
||||
"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.12.1.tgz",
|
||||
"integrity": "sha512-aXyV1ydKNA2u9fqRL8Z4fJ2RxNAusujNDdC4k0y9CawNEay5AGYgxhANqmjAabGRzHxsvfCXJC09lvbTRMHIFA==",
|
||||
"version": "3.14.0",
|
||||
"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.14.0.tgz",
|
||||
"integrity": "sha512-TAxLtCfRyC/nOLeWoX/8MhdIF+Fi1e1NbLhIgEm5Kv9/gioAwSNaqLUYxjIClU1RaLwSTE8iaiHNVhTU4TS9DA==",
|
||||
"dependencies": {
|
||||
"@babel/plugin-transform-arrow-functions": "^7.0.0-0",
|
||||
"@babel/plugin-transform-nullish-coalescing-operator": "^7.0.0-0",
|
||||
|
|
|
@ -154,9 +154,9 @@
|
|||
"react-native-quick-actions": "0.3.13",
|
||||
"react-native-randombytes": "3.6.1",
|
||||
"react-native-rate": "1.2.12",
|
||||
"react-native-reanimated": "3.12.1",
|
||||
"react-native-share": "10.2.1",
|
||||
"react-native-svg": "15.3.0",
|
||||
"react-native-reanimated": "3.14.0",
|
||||
"react-native-safe-area-context": "4.10.8",
|
||||
"react-native-screens": "3.32.0",
|
||||
"react-native-secure-key-store": "https://github.com/BlueWallet/react-native-secure-key-store#2076b48",
|
||||
|
|
Loading…
Add table
Reference in a new issue