mirror of
https://github.com/protocolbuffers/protobuf
synced 2026-08-26 02:23:14 -04:00
[ObjC] Breaking Change: Remove deprecated apis.
PiperOrigin-RevId: 684478480
This commit is contained in:
parent
29c232a6b4
commit
2a52b900a1
6 changed files with 0 additions and 51 deletions
|
|
@ -114,9 +114,6 @@ __attribute__((objc_subclassing_restricted))
|
|||
@property(nonatomic, readonly, copy) NSString *package;
|
||||
/** The objc prefix declared in the proto file. */
|
||||
@property(nonatomic, readonly, copy, nullable) NSString *objcPrefix;
|
||||
/** The syntax of the proto file, this property will be removed in the future. */
|
||||
@property(nonatomic, readonly) GPBFileSyntax syntax
|
||||
__attribute__((deprecated("Syntax will be removed in the future.")));
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -319,7 +319,6 @@ static NSArray *NewFieldsArrayForHasIndex(int hasIndex, NSArray *allMessageField
|
|||
|
||||
@synthesize package = package_;
|
||||
@synthesize objcPrefix = objcPrefix_;
|
||||
@synthesize syntax = syntax_;
|
||||
|
||||
- (instancetype)initWithPackage:(NSString *)package
|
||||
objcPrefix:(NSString *)objcPrefix
|
||||
|
|
|
|||
|
|
@ -241,21 +241,6 @@ CF_EXTERN_C_END
|
|||
(nullable id<GPBExtensionRegistry>)extensionRegistry
|
||||
error:(NSError **)errorPtr;
|
||||
|
||||
/**
|
||||
* Parses the given data as this message's class, and merges those values into
|
||||
* this message.
|
||||
*
|
||||
* @param data The binary representation of the message to merge.
|
||||
* @param extensionRegistry The extension registry to use to look up extensions.
|
||||
*
|
||||
* @exception GPBCodedInputStreamException Exception thrown when parsing was
|
||||
* unsuccessful.
|
||||
**/
|
||||
- (void)mergeFromData:(NSData *)data
|
||||
extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry
|
||||
__attribute__((deprecated(
|
||||
"Use -mergeFromData:extensionRegistry:error: instead, especaily if calling from Swift.")));
|
||||
|
||||
/**
|
||||
* Parses the given data as this message's class, and merges those values into
|
||||
* this message.
|
||||
|
|
|
|||
|
|
@ -2227,15 +2227,6 @@ void GPBClearMessageAutocreator(GPBMessage *self) {
|
|||
|
||||
#pragma mark - mergeFrom
|
||||
|
||||
- (void)mergeFromData:(NSData *)data extensionRegistry:(id<GPBExtensionRegistry>)extensionRegistry {
|
||||
GPBCodedInputStream *input = [[GPBCodedInputStream alloc] initWithData:data];
|
||||
@try {
|
||||
[self mergeFromCodedInputStream:input extensionRegistry:extensionRegistry endingTag:0];
|
||||
} @finally {
|
||||
[input release];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)mergeFromData:(NSData *)data
|
||||
extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry
|
||||
error:(NSError **)errorPtr {
|
||||
|
|
|
|||
|
|
@ -88,17 +88,6 @@ typedef NS_ENUM(NSInteger, GPBWellKnownTypesErrorCode) {
|
|||
**/
|
||||
- (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval;
|
||||
|
||||
// These next two methods are deprecated because GBPDuration has no need of a
|
||||
// "base" time. The older methods were about symmetry with GBPTimestamp, but
|
||||
// the unix epoch usage is too confusing.
|
||||
|
||||
/** Deprecated, use timeInterval instead. */
|
||||
@property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970
|
||||
__attribute__((deprecated("Use timeInterval")));
|
||||
/** Deprecated, use initWithTimeInterval: instead. */
|
||||
- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970
|
||||
__attribute__((deprecated("Use initWithTimeInterval:")));
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - GPBAny
|
||||
|
|
|
|||
|
|
@ -114,10 +114,6 @@ static NSString *ParseTypeFromURL(NSString *typeURLString) {
|
|||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
|
||||
return [self initWithTimeInterval:timeIntervalSince1970];
|
||||
}
|
||||
|
||||
- (NSTimeInterval)timeInterval {
|
||||
return TimeIntervalFromSecondsAndNanos(self.seconds, self.nanos);
|
||||
}
|
||||
|
|
@ -129,14 +125,6 @@ static NSString *ParseTypeFromURL(NSString *typeURLString) {
|
|||
self.nanos = nanos;
|
||||
}
|
||||
|
||||
- (NSTimeInterval)timeIntervalSince1970 {
|
||||
return self.timeInterval;
|
||||
}
|
||||
|
||||
- (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
|
||||
self.timeInterval = timeIntervalSince1970;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - GPBAny
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue