Skip to content

Commit

Permalink
⬆️ support(llm): upgrade react native from 0.74.88 to 0.75.4
Browse files Browse the repository at this point in the history
  • Loading branch information
cgrellard-ledger committed Dec 9, 2024
1 parent 1daabaf commit b3987c5
Show file tree
Hide file tree
Showing 17 changed files with 2,668 additions and 1,736 deletions.
5 changes: 5 additions & 0 deletions .changeset/chatty-shirts-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": minor
---

LLM - Upgrade React Native from v0.74.88 to v0.75.4
4 changes: 2 additions & 2 deletions apps/ledger-live-mobile/Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source "https://rubygems.org"

gem "fastlane", '~> 2.223.1'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem "dotenv"
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem "semver2", "~> 3.4", ">= 3.4.2"

plugins_path = File.join(File.dirname(__FILE__), "fastlane", "Pluginfile")
Expand Down
4 changes: 2 additions & 2 deletions apps/ledger-live-mobile/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.5, < 7.1.0)
cocoapods (>= 1.13, < 1.15)
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
dotenv
fastlane (~> 2.223.1)
fastlane-plugin-load_json
Expand Down
10 changes: 0 additions & 10 deletions apps/ledger-live-mobile/__tests__/jest-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@ jest.mock("expo-camera/legacy", () => {
};
});

jest.mock("expo-barcode-scanner", () => ({
BarCodeScanner: {
Constants: {
BarCodeType: {
qr: "qr",
},
},
},
}));

jest.mock("expo-camera", () => {
return {
CameraView: jest.fn(() => null),
Expand Down
19 changes: 10 additions & 9 deletions apps/ledger-live-mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
*/
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
Expand Down Expand Up @@ -61,6 +61,8 @@ react {
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]
/* Autolinking */
autolinkLibrariesWithApp()
}

/**
Expand Down Expand Up @@ -223,5 +225,4 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.0.0"
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
apply plugin: 'kotlin-android'
2 changes: 1 addition & 1 deletion apps/ledger-live-mobile/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
androidXAnnotation = "1.2.0"
androidXBrowser = "1.3.0"
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.22"
kotlinVersion = "1.9.24"
}
repositories {
google()
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/ledger-live-mobile/android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
5 changes: 3 additions & 2 deletions apps/ledger-live-mobile/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
pluginManagement { includeBuild(file("../node_modules/@react-native/gradle-plugin").toPath().toRealPath().toAbsolutePath().toString()) }
plugins { id("com.facebook.react.settings") }
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
rootProject.name = 'ledgerlivemobile'
include ':react-native-fast-crypto'
project(':react-native-fast-crypto').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-crypto/android')
Expand All @@ -7,8 +10,6 @@ project(':react-native-webview').projectDir = new File(rootProject.projectDir, '
apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
useExpoModules()

apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

include ':app'
includeBuild(file('../node_modules/@react-native/gradle-plugin').toPath().toRealPath().toAbsolutePath().toString()) // https://github.com/facebook/react-native/issues/34432#issuecomment-1380612455

Expand Down
Loading

0 comments on commit b3987c5

Please sign in to comment.