Skip to content

Commit

Permalink
Revert "Add better APIs for initializing MTRCluster instances from Sw…
Browse files Browse the repository at this point in the history
…ift. (#29915)" (#30131)

This reverts commit 954fff0.

The reason for the revert is that some of the CI systems we are dealing with do
not have a reasonable Swift compiler yet, which cause CI to fail on
Matter.framework.

Note that if relanding it's better to revert this PR, because the revert had
some conflicts that had to be resolved.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Jan 9, 2024
1 parent 5594745 commit 3a42b6a
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 772 deletions.
2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/MTRDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
#if MTR_ENABLE_PROVISIONAL
#define MTR_PROVISIONALLY_AVAILABLE MTR_NEWLY_AVAILABLE
#else
#define MTR_PROVISIONALLY_AVAILABLE API_UNAVAILABLE(ios, macos, tvos, watchos) MTR_HIDDEN
#define MTR_PROVISIONALLY_AVAILABLE NS_UNAVAILABLE MTR_HIDDEN
#endif

#ifndef MTR_PER_CONTROLLER_STORAGE_ENABLED
Expand Down
15 changes: 0 additions & 15 deletions src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt

This file was deleted.

5 changes: 0 additions & 5 deletions src/darwin/Framework/CHIP/templates/templates.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@
"name": "Objc ZCL synchronous API",
"output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm"
},
{
"path": "MTRClusters-swift.zapt",
"name": "Swift ZCL synchronous API Header extensions",
"output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift"
},
{
"path": "MTRStructsObjc.zapt",
"name": "Objc reflections of MTR spec structs header",
Expand Down
Loading

0 comments on commit 3a42b6a

Please sign in to comment.