Dependencies update (#951)

* update dependencies

* Update .gitignore
This commit is contained in:
minenice55 2024-05-19 17:35:20 -04:00
parent c812ed215c
commit 3506c81af1
3 changed files with 6 additions and 5 deletions

View file

@ -8,14 +8,14 @@ jobs:
cherry_no_future_to_current: cherry_no_future_to_current:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Cherry pick into current release name: Cherry pick into current release
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release-2') }} if: ${{ !contains(github.event.pull_request.labels.*.name, 'release-2') && github.event.pull_request.merged == true }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Cherry pick into current release - name: Cherry pick into current release
uses: xealth/cherry-pick-action@v1.0.0 uses: carloscastrojumo/github-cherry-pick-action@v1.0.10
with: with:
branch: release_1_patches branch: release_1_patches
labels: | labels: |

1
.gitignore vendored
View file

@ -86,3 +86,4 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/*.meta /[Aa]ssets/[Ss]treamingAssets/*.meta
/[Aa]ssets/[Ss]treamingAssets/[Ss]treamingAssets /[Aa]ssets/[Ss]treamingAssets/[Ss]treamingAssets
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset

View file

@ -41,9 +41,9 @@
"source": "git", "source": "git",
"dependencies": { "dependencies": {
"com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.nuget.newtonsoft-json": "3.2.1",
"jillejr.newtonsoft.json-for-unity.converters": "1.5.1" "jillejr.newtonsoft.json-for-unity.converters": "1.6.3"
}, },
"hash": "81516bd0bf64681a829ac2d807fd2180077dd3f8" "hash": "6a677b7861692a668deab7a78be01fe4fcd2be09"
}, },
"com.sator-imaging.alt-source-generator": { "com.sator-imaging.alt-source-generator": {
"version": "https://github.com/sator-imaging/Unity-AltSourceGenerator.git", "version": "https://github.com/sator-imaging/Unity-AltSourceGenerator.git",
@ -206,7 +206,7 @@
"hash": "4b351991a8c464adc961232425ff99f607396b9d" "hash": "4b351991a8c464adc961232425ff99f607396b9d"
}, },
"jillejr.newtonsoft.json-for-unity.converters": { "jillejr.newtonsoft.json-for-unity.converters": {
"version": "1.5.1", "version": "1.6.3",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},