Skip to content

Commit 2a52b90

Browse files
thomasvlcopybara-github
authored andcommitted
[ObjC] Breaking Change: Remove deprecated apis.
PiperOrigin-RevId: 684478480
1 parent 29c232a commit 2a52b90

File tree

6 files changed

+0
-51
lines changed

6 files changed

+0
-51
lines changed

objectivec/GPBDescriptor.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ __attribute__((objc_subclassing_restricted))
114114
@property(nonatomic, readonly, copy) NSString *package;
115115
/** The objc prefix declared in the proto file. */
116116
@property(nonatomic, readonly, copy, nullable) NSString *objcPrefix;
117-
/** The syntax of the proto file, this property will be removed in the future. */
118-
@property(nonatomic, readonly) GPBFileSyntax syntax
119-
__attribute__((deprecated("Syntax will be removed in the future.")));
120117

121118
@end
122119

objectivec/GPBDescriptor.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ @implementation GPBFileDescriptor {
319319

320320
@synthesize package = package_;
321321
@synthesize objcPrefix = objcPrefix_;
322-
@synthesize syntax = syntax_;
323322

324323
- (instancetype)initWithPackage:(NSString *)package
325324
objcPrefix:(NSString *)objcPrefix

objectivec/GPBMessage.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,21 +241,6 @@ CF_EXTERN_C_END
241241
(nullable id<GPBExtensionRegistry>)extensionRegistry
242242
error:(NSError **)errorPtr;
243243

244-
/**
245-
* Parses the given data as this message's class, and merges those values into
246-
* this message.
247-
*
248-
* @param data The binary representation of the message to merge.
249-
* @param extensionRegistry The extension registry to use to look up extensions.
250-
*
251-
* @exception GPBCodedInputStreamException Exception thrown when parsing was
252-
* unsuccessful.
253-
**/
254-
- (void)mergeFromData:(NSData *)data
255-
extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry
256-
__attribute__((deprecated(
257-
"Use -mergeFromData:extensionRegistry:error: instead, especaily if calling from Swift.")));
258-
259244
/**
260245
* Parses the given data as this message's class, and merges those values into
261246
* this message.

objectivec/GPBMessage.m

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2227,15 +2227,6 @@ - (void)clearExtension:(GPBExtensionDescriptor *)extension {
22272227

22282228
#pragma mark - mergeFrom
22292229

2230-
- (void)mergeFromData:(NSData *)data extensionRegistry:(id<GPBExtensionRegistry>)extensionRegistry {
2231-
GPBCodedInputStream *input = [[GPBCodedInputStream alloc] initWithData:data];
2232-
@try {
2233-
[self mergeFromCodedInputStream:input extensionRegistry:extensionRegistry endingTag:0];
2234-
} @finally {
2235-
[input release];
2236-
}
2237-
}
2238-
22392230
- (BOOL)mergeFromData:(NSData *)data
22402231
extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry
22412232
error:(NSError **)errorPtr {

objectivec/GPBWellKnownTypes.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,6 @@ typedef NS_ENUM(NSInteger, GPBWellKnownTypesErrorCode) {
8888
**/
8989
- (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval;
9090

91-
// These next two methods are deprecated because GBPDuration has no need of a
92-
// "base" time. The older methods were about symmetry with GBPTimestamp, but
93-
// the unix epoch usage is too confusing.
94-
95-
/** Deprecated, use timeInterval instead. */
96-
@property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970
97-
__attribute__((deprecated("Use timeInterval")));
98-
/** Deprecated, use initWithTimeInterval: instead. */
99-
- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970
100-
__attribute__((deprecated("Use initWithTimeInterval:")));
101-
10291
@end
10392

10493
#pragma mark - GPBAny

objectivec/GPBWellKnownTypes.m

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ - (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval {
114114
return self;
115115
}
116116

117-
- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
118-
return [self initWithTimeInterval:timeIntervalSince1970];
119-
}
120-
121117
- (NSTimeInterval)timeInterval {
122118
return TimeIntervalFromSecondsAndNanos(self.seconds, self.nanos);
123119
}
@@ -129,14 +125,6 @@ - (void)setTimeInterval:(NSTimeInterval)timeInterval {
129125
self.nanos = nanos;
130126
}
131127

132-
- (NSTimeInterval)timeIntervalSince1970 {
133-
return self.timeInterval;
134-
}
135-
136-
- (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
137-
self.timeInterval = timeIntervalSince1970;
138-
}
139-
140128
@end
141129

142130
#pragma mark - GPBAny

0 commit comments

Comments
 (0)