Skip to content

Commit

Permalink
Merge branch 'IOPLT-551-upgrade-to-rn-072' into SIW-1159-xstate-issua…
Browse files Browse the repository at this point in the history
…nce-machine-scaffolding
  • Loading branch information
mastro993 committed Jul 2, 2024
2 parents aa0e2cb + de3b204 commit df9cdcd
Show file tree
Hide file tree
Showing 280 changed files with 96,467 additions and 82,906 deletions.
6 changes: 0 additions & 6 deletions .buckconfig

This file was deleted.

17 changes: 15 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module.exports = {
"plugin:react-hooks/recommended",
"plugin:react-native-a11y/all",
"plugin:sonarjs/recommended",
"prettier"
"prettier",
"@react-native"
],
parser: "@typescript-eslint/parser",
parserOptions: {
Expand All @@ -26,9 +27,11 @@ module.exports = {
"import",
"functional",
"sonarjs",
"@jambit/typed-redux-saga"
"@jambit/typed-redux-saga",
"@stylistic/eslint-plugin-js"
],
rules: {
"comma-dangle": ["error", "never"],
"no-case-declarations": "off",
"no-inner-declarations": "off",
"prefer-const": "error",
Expand All @@ -47,7 +50,9 @@ module.exports = {
"no-console": "error",
"no-caller": "error",
"no-bitwise": "error",
"no-void": "off",
"no-duplicate-imports": "error",
quotes: "off",
eqeqeq: ["error", "smart"],
"max-classes-per-file": ["error", 1],
"guard-for-in": "error",
Expand Down Expand Up @@ -94,6 +99,14 @@ module.exports = {
"react/display-name": "off",
"react/jsx-key": "error",
"react/jsx-no-bind": ["error", { allowArrowFunctions: true }],
"react/no-unstable-nested-components": [
"off",
{
allowAsProps: true
}
],
"react/no-direct-mutation-state": "off",
"react/require-render-return": "off",
"functional/no-let": "error",
"functional/immutable-data": "error",
"sonarjs/no-small-switch": "off",
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- id: build-release-android
run: |
./scripts/android-release.sh ./android/app
yarn bundle:android-release
cd android && bundle exec fastlane alpha
bundle exec fastlane promote_internal_to_alpha
shell: bash
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,10 @@ android/app/google-services.json
GeneratedDotEnv.m

# XState Typegen
**/*.typegen.*
**/*.typegen.*

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# yarn cache dir
.yarn/cache
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ source "https://rubygems.org"
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '>=2.6.10'

gem "cocoapods", ">= 1.15.2"
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem "fastlane", "~> 2.212.2"
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ GEM
babosa (1.0.4)
base64 (0.2.0)
claide (1.1.0)
cocoapods (1.15.2)
cocoapods (1.14.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-core (= 1.14.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -54,7 +54,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
cocoapods-core (1.14.3)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand Down Expand Up @@ -273,7 +273,7 @@ PLATFORMS

DEPENDENCIES
activesupport (>= 6.1.7.3, < 7.1.0)
cocoapods (>= 1.15.2)
cocoapods (>= 1.13, < 1.15)
fastlane (~> 2.212.2)

RUBY VERSION
Expand Down
55 changes: 0 additions & 55 deletions android/app/BUCK

This file was deleted.

Loading

0 comments on commit df9cdcd

Please sign in to comment.