From d9caebc313256ea2f5c6922113c1f3edf14b24ad Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Thu, 10 Oct 2024 14:32:22 -0700
Subject: [PATCH] Breaking Change: [ObjC] Remove legacy WKT headers.

These have been empty and forwarding to the real versions for
years now. Everyone should have migrated to the GPB[Name].pbobjc.h
versions instead.

PiperOrigin-RevId: 684580342
---
 Protobuf.podspec                                  | 12 +-----------
 objectivec/BUILD.bazel                            | 10 ----------
 objectivec/google/protobuf/Any.pbobjc.h           |  2 --
 objectivec/google/protobuf/Api.pbobjc.h           |  2 --
 objectivec/google/protobuf/Duration.pbobjc.h      |  2 --
 objectivec/google/protobuf/Empty.pbobjc.h         |  2 --
 objectivec/google/protobuf/FieldMask.pbobjc.h     |  2 --
 objectivec/google/protobuf/SourceContext.pbobjc.h |  2 --
 objectivec/google/protobuf/Struct.pbobjc.h        |  2 --
 objectivec/google/protobuf/Timestamp.pbobjc.h     |  2 --
 objectivec/google/protobuf/Type.pbobjc.h          |  2 --
 objectivec/google/protobuf/Wrappers.pbobjc.h      |  2 --
 12 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 objectivec/google/protobuf/Any.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Api.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Duration.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Empty.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/FieldMask.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/SourceContext.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Struct.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Timestamp.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Type.pbobjc.h
 delete mode 100644 objectivec/google/protobuf/Wrappers.pbobjc.h

diff --git a/Protobuf.podspec b/Protobuf.podspec
index 9a80e2ab25177..b16899eea4197 100644
--- a/Protobuf.podspec
+++ b/Protobuf.podspec
@@ -18,17 +18,7 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
                :tag => "v#{s.version}" }
 
-  s.source_files = 'objectivec/*.{h,m,swift}',
-                   'objectivec/google/protobuf/Any.pbobjc.h',
-                   'objectivec/google/protobuf/Api.pbobjc.h',
-                   'objectivec/google/protobuf/Duration.pbobjc.h',
-                   'objectivec/google/protobuf/Empty.pbobjc.h',
-                   'objectivec/google/protobuf/FieldMask.pbobjc.h',
-                   'objectivec/google/protobuf/SourceContext.pbobjc.h',
-                   'objectivec/google/protobuf/Struct.pbobjc.h',
-                   'objectivec/google/protobuf/Timestamp.pbobjc.h',
-                   'objectivec/google/protobuf/Type.pbobjc.h',
-                   'objectivec/google/protobuf/Wrappers.pbobjc.h'
+  s.source_files = 'objectivec/*.{h,m,swift}'
   # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be
   # left out, as it's an umbrella implementation file.
   s.exclude_files = 'objectivec/GPBProtocolBuffers.m'
diff --git a/objectivec/BUILD.bazel b/objectivec/BUILD.bazel
index 8165095589f32..7dbbb353c195f 100644
--- a/objectivec/BUILD.bazel
+++ b/objectivec/BUILD.bazel
@@ -92,16 +92,6 @@ objc_library(
         "GPBUtilities.h",
         "GPBWellKnownTypes.h",
         "GPBWireFormat.h",
-        "google/protobuf/Any.pbobjc.h",
-        "google/protobuf/Api.pbobjc.h",
-        "google/protobuf/Duration.pbobjc.h",
-        "google/protobuf/Empty.pbobjc.h",
-        "google/protobuf/FieldMask.pbobjc.h",
-        "google/protobuf/SourceContext.pbobjc.h",
-        "google/protobuf/Struct.pbobjc.h",
-        "google/protobuf/Timestamp.pbobjc.h",
-        "google/protobuf/Type.pbobjc.h",
-        "google/protobuf/Wrappers.pbobjc.h",
         # Package private headers, but exposed because the generated sources
         # need to use them.
         "GPBArray_PackagePrivate.h",
diff --git a/objectivec/google/protobuf/Any.pbobjc.h b/objectivec/google/protobuf/Any.pbobjc.h
deleted file mode 100644
index e6d1b7450abe5..0000000000000
--- a/objectivec/google/protobuf/Any.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBAny.pbobjc.h"
diff --git a/objectivec/google/protobuf/Api.pbobjc.h b/objectivec/google/protobuf/Api.pbobjc.h
deleted file mode 100644
index e7957db4e1220..0000000000000
--- a/objectivec/google/protobuf/Api.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBApi.pbobjc.h"
diff --git a/objectivec/google/protobuf/Duration.pbobjc.h b/objectivec/google/protobuf/Duration.pbobjc.h
deleted file mode 100644
index fabf00f413d1e..0000000000000
--- a/objectivec/google/protobuf/Duration.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBDuration.pbobjc.h"
diff --git a/objectivec/google/protobuf/Empty.pbobjc.h b/objectivec/google/protobuf/Empty.pbobjc.h
deleted file mode 100644
index 4de910870aa15..0000000000000
--- a/objectivec/google/protobuf/Empty.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBEmpty.pbobjc.h"
diff --git a/objectivec/google/protobuf/FieldMask.pbobjc.h b/objectivec/google/protobuf/FieldMask.pbobjc.h
deleted file mode 100644
index 26913200467ae..0000000000000
--- a/objectivec/google/protobuf/FieldMask.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBFieldMask.pbobjc.h"
diff --git a/objectivec/google/protobuf/SourceContext.pbobjc.h b/objectivec/google/protobuf/SourceContext.pbobjc.h
deleted file mode 100644
index 321dfec993b21..0000000000000
--- a/objectivec/google/protobuf/SourceContext.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBSourceContext.pbobjc.h"
diff --git a/objectivec/google/protobuf/Struct.pbobjc.h b/objectivec/google/protobuf/Struct.pbobjc.h
deleted file mode 100644
index 1173d16fac609..0000000000000
--- a/objectivec/google/protobuf/Struct.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBStruct.pbobjc.h"
diff --git a/objectivec/google/protobuf/Timestamp.pbobjc.h b/objectivec/google/protobuf/Timestamp.pbobjc.h
deleted file mode 100644
index 6a7cef84492ae..0000000000000
--- a/objectivec/google/protobuf/Timestamp.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBTimestamp.pbobjc.h"
diff --git a/objectivec/google/protobuf/Type.pbobjc.h b/objectivec/google/protobuf/Type.pbobjc.h
deleted file mode 100644
index e14e7cdcae8fb..0000000000000
--- a/objectivec/google/protobuf/Type.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBType.pbobjc.h"
diff --git a/objectivec/google/protobuf/Wrappers.pbobjc.h b/objectivec/google/protobuf/Wrappers.pbobjc.h
deleted file mode 100644
index 8365afc6df211..0000000000000
--- a/objectivec/google/protobuf/Wrappers.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBWrappers.pbobjc.h"