Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/nick-invision/retr…
Browse files Browse the repository at this point in the history
…y-2.9.0
  • Loading branch information
DanielFran authored Oct 5, 2023
2 parents b7fd3b8 + 7dd756a commit 847ba70
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
SCRIPT_DIR: ./test/scripts
PLATFORM: ios
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
- run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
- uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copyright-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
timeout-minutes: 40
steps:
# Checkout
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
with:
ref: main
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node_version: [16.x]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
- uses: actions/[email protected]
with:
node-version: ${{ matrix.node_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
JHI_RECORD_VIDEO: ${{ github.event.inputs.recordVideo || 'false' }}
JHI_SCREENSHOTS: ${{ github.event.inputs.screenshots || 'false' }}
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
- uses: actions/setup-java@v3
with:
distribution: 'adopt'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
- uses: actions/[email protected]
with:
node-version: 16
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sample-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ jobs:
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN || '' }}
JHIPSTER_VERSION: ${{ matrix.jhipster_version }}
steps:
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
name: 'SETUP: checkout generator-react-native'
with:
path: generator-jhipster-react-native
- uses: actions/checkout@v4.0.0
- uses: actions/checkout@v4.1.0
name: 'SETUP: checkout jhipster-sample-app-react-native'
with:
token: ${{ secrets.SAMPLE_GITHUB_TOKEN || github.token }}
Expand Down
18 changes: 9 additions & 9 deletions generators/app/templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@react-native-masked-view/masked-view": "0.2.9",
"@react-navigation/devtools": "6.0.19",
"@react-navigation/drawer": "6.6.4",
"@react-navigation/native": "6.1.7",
"@react-navigation/stack": "6.3.17",
"@react-navigation/native": "6.1.8",
"@react-navigation/stack": "6.3.18",
"apisauce": "3.0.1",
"format-json": "1.0.3",
"formik": "2.4.5",
Expand All @@ -22,30 +22,30 @@
"react-native-modal-datetime-picker": "17.1.0",
"react-native-picker-select": "8.1.0",
"react-native-sectioned-multi-select": "0.10.0",
"react-redux": "8.1.2",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-persist": "6.0.0",
"redux-saga": "1.2.3",
"reduxsauce": "1.2.1",
"seamless-immutable": "7.1.4",
"sockjs-client": "1.6.1",
"webstomp-client": "1.2.6",
"yup": "1.3.1"
"yup": "1.3.2"
},
"devDependencies": {
"@react-native-community/eslint-config": "3.2.0",
"@ruddell/detox-expo-helpers": "0.7.0",
"@storybook/addons": "7.4.5",
"@storybook/addons": "7.4.6",
"@storybook/react-native": "6.5.6",
"@storybook/theming": "7.4.3",
"@storybook/theming": "7.4.6",
"@testing-library/jest-native": "5.4.3",
"@testing-library/react-native": "12.3.0",
"babel-jest": "29.7.0",
"babel-preset-env": "1.7.0",
"buffer": "6.0.3",
"create-expo-app": "2.1.1",
"detox": "20.12.1",
"eslint": "8.49.0",
"detox": "20.13.0",
"eslint": "8.50.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-prettier": "4.2.1",
"expect": "29.7.0",
Expand All @@ -60,7 +60,7 @@
"react-test-renderer": "18.2.0",
"redux-devtools-extension": "2.13.9",
"resolve": "1.22.6",
"rimraf": "5.0.1",
"rimraf": "5.0.5",
"tapable": "2.2.1"
}
}
120 changes: 63 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
"yeoman-environment": "3.19.3"
},
"devDependencies": {
"chai": "4.3.8",
"chai": "4.3.10",
"ejs-lint": "2.0.0",
"eslint": "8.49.0",
"eslint": "8.50.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.28.1",
Expand Down

0 comments on commit 847ba70

Please sign in to comment.