Update ZAP to fix codegen for nullable attributes. (#33834)

bzbarsky-apple · web-flow · commit e1b5fbe283ad · 2024-06-10T21:57:31.000Z
Fixes #33413 MIN_ZAP_VERSION is set differently from the tag being used, because the actual changeset tagged with that tag is from 2024-06-06, not 2024-06-10.
diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -8,13 +8,13 @@
                 "mac-amd64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2024.04.15-nightly.1"]
+            "tags": ["version:2@v2024.06.10-nightly.1"]
         },
         {
             "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
             "path": "fuchsia/third_party/zap/mac-amd64",
             "platforms": ["mac-arm64"],
-            "tags": ["version:2@v2024.04.15-nightly.1"]
+            "tags": ["version:2@v2024.06.10-nightly.1"]
         }
     ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
@@ -1 +1 @@
-v2024.04.15-nightly
+v2024.06.10-nightly
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2024.4.15'
+MIN_ZAP_VERSION = '2024.6.6'
 
 
 class ZapTool:

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@`
`8`	`8`	`"mac-amd64",`
`9`	`9`	`"windows-amd64"`
`10`	`10`	`],`
`11`		`- "tags": ["version:2@v2024.04.15-nightly.1"]`
	`11`	`+ "tags": ["version:2@v2024.06.10-nightly.1"]`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",`
`15`	`15`	`"path": "fuchsia/third_party/zap/mac-amd64",`
`16`	`16`	`"platforms": ["mac-arm64"],`
`17`		`- "tags": ["version:2@v2024.04.15-nightly.1"]`
	`17`	`+ "tags": ["version:2@v2024.06.10-nightly.1"]`
`18`	`18`	`}`
`19`	`19`	`]`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-v2024.04.15-nightly`
	`1`	`+v2024.06.10-nightly`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`# Use scripts/tools/zap/version_update.py to manage ZAP versioning as many`
`24`	`24`	`# files may need updating for versions`
`25`	`25`	`#`
`26`		`-MIN_ZAP_VERSION = '2024.4.15'`
	`26`	`+MIN_ZAP_VERSION = '2024.6.6'`
`27`	`27`
`28`	`28`
`29`	`29`	`class ZapTool:`