diff --git a/src/.env b/src/.env index 82b81d17a..c618dea5d 100644 --- a/src/.env +++ b/src/.env @@ -1,3 +1,3 @@ -NODE_ENV=prod +NODE_ENV=dev APP_VERSION=1.5.1 RELEASE_NUMBER=22 diff --git a/src/.ruby-version b/src/.ruby-version index 5b013b97d..acf9bf09d 100644 --- a/src/.ruby-version +++ b/src/.ruby-version @@ -1 +1 @@ -2.7.6 \ No newline at end of file +3.2.2 \ No newline at end of file diff --git a/src/.yarnrc.yml b/src/.yarnrc.yml new file mode 100644 index 000000000..08d714dfc --- /dev/null +++ b/src/.yarnrc.yml @@ -0,0 +1,3 @@ +nodeLinker: node-modules + +yarnPath: .yarn/releases/yarn-3.6.4.cjs diff --git a/src/Gemfile b/src/Gemfile index 2e1339913..fb57a67fb 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -3,5 +3,6 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version ruby ">= 3.3.2" -gem 'cocoapods', '~> 1.13' -gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' +# Exclude problematic versions of cocoapods and activesupport that causes build failures. +gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' +gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' diff --git a/src/Gemfile.lock b/src/Gemfile.lock index ba387de50..4b6b4a9d5 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -89,8 +89,8 @@ PLATFORMS ruby DEPENDENCIES - activesupport (>= 6.1.7.3, < 7.1.0) - cocoapods (~> 1.13) + activesupport (>= 6.1.7.5, != 7.1.0) + cocoapods (>= 1.13, != 1.15.1, != 1.15.0) RUBY VERSION ruby 3.2.2p53 diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle index 2e84b61ec..4e4c004d2 100644 --- a/src/android/app/build.gradle +++ b/src/android/app/build.gradle @@ -17,14 +17,14 @@ apply plugin: 'com.google.firebase.crashlytics' */ 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 @@ -58,6 +58,9 @@ 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() } /** @@ -142,7 +145,6 @@ android { dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - implementation("com.facebook.react:flipper-integration") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") @@ -150,5 +152,3 @@ dependencies { implementation jscFlavor } } - -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index d40fed54b..f1b5a8b4b 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -10,7 +10,8 @@ android:icon="@mipmap/icon_dggg" android:roundIcon="@mipmap/icon_dggg_round" android:allowBackup="false" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:supportsRtl="true"> + android:insetBottom="@dimen/abc_edit_text_inset_bottom_material" + >