Skip to content

Commit

Permalink
Merge pull request #424 from cultuurnet/develop
Browse files Browse the repository at this point in the history
Merge in main
  • Loading branch information
samvanhoeyicapps authored May 15, 2024
2 parents 79c55b8 + af7a6f6 commit 25182c5
Show file tree
Hide file tree
Showing 108 changed files with 5,466 additions and 4,851 deletions.
6 changes: 0 additions & 6 deletions .buckconfig

This file was deleted.

8 changes: 6 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@
"simple-import-sort"
],
"extends": [
"@react-native",
"eslint:recommended",
"plugin:react/recommended",
"eslint-config-prettier",
"plugin:import/warnings",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended"
],
"rules": {
"import/order": 1,
"import/no-named-as-default": 0,
"no-console": 2,
"react-hooks/rules-of-hooks": 2,
"react-hooks/exhaustive-deps": 2,
"react/prop-types": 0,
"react/no-unstable-nested-components": 0,
"react-native/no-inline-styles": 0,
"@typescript-eslint/no-shadow": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/explicit-module-boundary-types": 0,
"@typescript-eslint/interface-name-prefix": 0,
Expand Down Expand Up @@ -94,7 +98,7 @@
]
},
"env": {
"browser": true
"browser": false
},
"overrides": [
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-beta-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
cache: gradle
- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-prod-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
cache: gradle
- uses: actions/setup-node@v3
with:
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore

# node.js
#
Expand Down Expand Up @@ -74,6 +76,12 @@ buck-out/
.vscode
/vendor/bundle/

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

# testing
/coverage

# bundler and artifacts
.bundle
metadata.json
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.1
20
8 changes: 8 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

# 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 'activesupport', '>= 6.1.7.5', '< 7.1.0'

gem 'rake', '~> 13.0'

group :syntax do
Expand Down
Loading

0 comments on commit 25182c5

Please sign in to comment.