Skip to content

Commit

Permalink
merge pain
Browse files Browse the repository at this point in the history
  • Loading branch information
vanGalilea committed Jan 31, 2024
2 parents e33b550 + 14705b5 commit 13d0841
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 5 deletions.
19 changes: 15 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
rn-cli-app/ios/.xcode.env.local
**/ios/.xcode.env.local

# Android/IntelliJ
#
Expand Down Expand Up @@ -56,13 +56,24 @@ yarn-error.log
*.jsbundle

# Ruby / CocoaPods
/ios/Pods/
/vendor/bundle/
**/ios/Pods/
**/vendor/bundle/

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

# testing
/coverage
**/coverage

*.env

# Expo
**/.expo/
**/dist/
**/web-build/

# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
# The following patterns were generated by expo-cli

**/expo-env.d.ts
# @end expo-cli
2 changes: 1 addition & 1 deletion apps/rn-cli-app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
root: true,
extends: '@react-native',
ignorePatterns: ['e2e/', 'coverage'],
ignorePatterns: ['.maestro/', 'coverage'],
};
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions apps/rn-cli-app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ android {
keyAlias 'androiddebugkey'
keyPassword 'android'
}
release {
// Caution! In production, you need to generate your own keystore file.
// see https://reactnative.dev/docs/signed-apk-android.
storeFile file('release.keystore')
storePassword 'your_key_alias'
keyAlias '!igF-.z6Tw@BscKx'
keyPassword '!igF-.z6Tw@BscKx'
}
}
buildTypes {
debug {
Expand Down

0 comments on commit 13d0841

Please sign in to comment.