Extern: Update json library to version 3.11.3 #118899

Open
Jakub Marcowski wants to merge 3 commits from Chubercik/blender:json-3.11.3 into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Contributor

Ref. #118455

- Updated the `json` lib to version `3.11.3` (https://github.com/nlohmann/json/releases/tag/v3.11.3) - Updated `json`'s entry in the `release/license/THIRD-PARTY-LICENSES.txt` file Ref. #118455
Jakub Marcowski added 1 commit 2024-02-29 11:44:36 +01:00
Author
Contributor

Everything builds as expected (the (modified) indicator next to the branch name has something to do with my Git LFS setup; see: https://blender.chat/channel/blender-coders?msg=jvxizRDQP3rrYjib9):

image

Everything builds as expected (the `(modified)` indicator next to the branch name has something to do with my Git LFS setup; see: https://blender.chat/channel/blender-coders?msg=jvxizRDQP3rrYjib9): ![image](/attachments/a0cc58b2-99cb-4b4c-9d74-65dc0a723dc9)
500 KiB
Iliya Katushenock added this to the Platforms, Builds Tests & Devices project 2024-02-29 12:12:15 +01:00
Jakub Marcowski requested review from Ray molenkamp 2024-03-01 11:34:31 +01:00
Jakub Marcowski added 1 commit 2024-03-05 18:09:13 +01:00
Merge remote-tracking branch 'origin/main' into json-3.11.3
Some checks failed
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-coordinator Build done.
faf157db3c
Jakub Marcowski requested review from Campbell Barton 2024-03-07 09:58:51 +01:00
Jakub Marcowski removed review request for Campbell Barton 2024-07-09 02:15:29 +02:00
Jakub Marcowski removed review request for Ray molenkamp 2024-07-09 02:15:58 +02:00
Jakub Marcowski requested review from Ray molenkamp 2024-07-09 02:16:08 +02:00
Member

Not super thrilled about updating things just since it's nice to have a newer version, if it solves an actual bug, or resolves a security issue it's a different story though, however the last time we updated this ( 3d1bcb3b74 ) it was because...it's nice to have a new version, so i'll leave the final call here up to the consumer of the library @JulianEisel .

Updated json's entry in the release/license/THIRD-PARTY-LICENSES.txt file

not needed, this file is auto generated and will be updated automatically during the release process

Not super thrilled about updating things just since it's nice to have a newer version, if it solves an actual bug, or resolves a security issue it's a different story though, _however_ the last time we updated this ( 3d1bcb3b74d0ca40312ce5d4591f29aa74f7fdbd ) it was because...it's nice to have a new version, so i'll leave the final call here up to the consumer of the library @JulianEisel . > Updated json's entry in the release/license/THIRD-PARTY-LICENSES.txt file not needed, this file is auto generated and will be updated automatically during the release process
Member

@blender-bot build

@blender-bot build
Author
Contributor

not needed, this file is auto generated and will be updated automatically during the release process

Yeah, this PR is a little dated, we had a talk about the licenses file right around when tinygltf got updated, which was after this one got posted.

The following tests FAILED:
	 59 - script_load_addons (Failed)
	 60 - script_load_modules (Failed)

CI seems to have a problem, but I doubt it's due to json being updated - API should've stayed the same.

> not needed, this file is auto generated and will be updated automatically during the release process Yeah, this PR is a little dated, we had a talk about the licenses file right around when `tinygltf` got updated, which was after this one got posted. ``` The following tests FAILED: 59 - script_load_addons (Failed) 60 - script_load_modules (Failed) ``` CI seems to have a problem, but I doubt it's due to `json` being updated - API should've stayed the same.
Member

Yeah there used to be a button for to merge main but that appears to have gone awol in one of the gitea updates, if you could merge main manually, i'll give it another go on the bots

Yeah there used to be a button for to merge main but that appears to have gone awol in one of the gitea updates, if you could merge main manually, i'll give it another go on the bots
Ray molenkamp requested review from Julian Eisel 2024-07-19 20:08:08 +02:00
Jakub Marcowski added 1 commit 2024-07-19 20:36:34 +02:00
Merge branch 'main' into json-3.11.3
All checks were successful
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-coordinator Build done.
59e7a252ee
Member

@blender-bot build

@blender-bot build
All checks were successful
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-coordinator Build done.
Merge conflict checking is in progress. Try again in few moments.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u json-3.11.3:Chubercik-json-3.11.3
git checkout Chubercik-json-3.11.3
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#118899
No description provided.