Skip to content

Commit ee7e05f

Browse files
committed
Merge branch 'master' of github.com:wix/react-native-calendars into release
2 parents 9546d22 + c4bd90f commit ee7e05f

File tree

72 files changed

+1207
-1459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1207
-1459
lines changed

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ module.exports = {
2020
},
2121
plugins: ['react', 'react-native', 'jest', '@typescript-eslint'],
2222
rules: {
23-
'react-native/no-inline-styles': 1,
23+
semi: ['error', 'always'],
2424
'linebreak-style': ['error', 'unix'],
2525
'no-unused-vars': 1,
2626
'object-curly-spacing': ['error', 'never'],
27-
semi: ['error', 'always'],
2827
'react/jsx-uses-react': 2,
2928
'react/jsx-uses-vars': 2,
29+
'react-native/no-inline-styles': 1,
3030
'@typescript-eslint/no-use-before-define': 0,
3131
'@typescript-eslint/no-var-requires': 0,
3232
'@typescript-eslint/explicit-function-return-type': 0,

.gitignore

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ DerivedData
2727
*.hmap
2828
*.ipa
2929
*.xcuserstate
30+
ios/.xcode.env.local
3031
# project.xcworkspace
3132

3233
# Android/IntelliJ
@@ -37,29 +38,27 @@ build/
3738
local.properties
3839
*.iml
3940
*.hprof
41+
.cxx/
42+
*.keystore
43+
!debug.keystore
4044

4145
# node.js
4246
#
4347
node_modules/
4448
npm-debug.log
4549
yarn-error.log
4650

47-
# BUCK
48-
buck-out/
49-
\.buckd/
50-
*.keystore
51-
!debug.keystore
52-
5351
# fastlane
5452
#
5553
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
5654
# screenshots whenever they are needed.
5755
# For more information about the recommended setup visit:
5856
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
5957

60-
fastlane/report.xml
61-
fastlane/Preview.html
62-
fastlane/screenshots
58+
**/fastlane/report.xml
59+
**/fastlane/Preview.html
60+
**/fastlane/screenshots
61+
**/fastlane/test_output
6362

6463
# Ruby / CocoaPods
6564
ios/Pods
@@ -68,3 +67,6 @@ ios/Podfile.lock
6867

6968
.eslintcache
7069
.reassure
70+
71+
# Temporary files created by Metro to check the health of the file watcher
72+
.metro-health-check*

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
2.7.6

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
3-
ruby '2.7.4'
4-
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
3+
ruby File.read(File.join(__dir__, '.ruby-version')).strip
4+
gem 'cocoapods', '~> 1.11', '>= 1.11.3'

android/app/_BUCK

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)