azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Native: fix Deprecation ObjCExport test after updating version to 1.9

Browse Source 
Starting from language version 1.9, deprecation is not propagated
through overrides (see KT-47902 for more details).
As a result, after updating langauge version to 1.9 in 66544a4,
testObjCExport started to fail, because it expected the old behaviour.
This commit updates the test correspondingly.
This commit is contained in:
Svyatoslav Scherbina
2023-01-30 15:24:41 +01:00
committed by Space Team
parent bf090cdc6d
commit 7ef7d0e062
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/tests/objcexport/expectedLazy.h
+9 -6
View File
@@ -2753,13 +2753,16 @@ __attribute__((swift_name("TestDeprecation.NormalOverride")))
- (instancetype)initWithNormal:(int64_t)normal __attribute__((swift_name("init(normal:)"))) __attribute__((objc_designated_initializer));
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (void)openError __attribute__((swift_name("openError()"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
- (void)openWarning __attribute__((swift_name("openWarning()"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
- (void)openHidden __attribute__((swift_name("openHidden()")));
- (void)openError __attribute__((swift_name("openError()")));
- (void)openWarning __attribute__((swift_name("openWarning()")));
- (int32_t)openNormal __attribute__((swift_name("openNormal()")));
@property (readonly) id _Nullable openErrorVal __attribute__((swift_name("openErrorVal"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
@property id _Nullable openErrorVar __attribute__((swift_name("openErrorVar"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
@property (readonly) id _Nullable openWarningVal __attribute__((swift_name("openWarningVal"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
@property id _Nullable openWarningVar __attribute__((swift_name("openWarningVar"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
@property (readonly) id _Nullable openHiddenVal __attribute__((swift_name("openHiddenVal")));
@property id _Nullable openHiddenVar __attribute__((swift_name("openHiddenVar")));
@property (readonly) id _Nullable openErrorVal __attribute__((swift_name("openErrorVal")));
@property id _Nullable openErrorVar __attribute__((swift_name("openErrorVar")));
@property (readonly) id _Nullable openWarningVal __attribute__((swift_name("openWarningVal")));
@property id _Nullable openWarningVar __attribute__((swift_name("openWarningVar")));
@property (readonly) id _Nullable openNormalVal __attribute__((swift_name("openNormalVal")));
@property id _Nullable openNormalVar __attribute__((swift_name("openNormalVar")));
@end
kotlin-native/backend.native/tests/objcexport/expectedLazyLegacySuspendUnit.h
+9 -6
View File
@@ -2688,13 +2688,16 @@ __attribute__((swift_name("TestDeprecation.NormalOverride")))
- (instancetype)initWithNormal:(int64_t)normal __attribute__((swift_name("init(normal:)"))) __attribute__((objc_designated_initializer));
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (void)openError __attribute__((swift_name("openError()"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
- (void)openWarning __attribute__((swift_name("openWarning()"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
- (void)openHidden __attribute__((swift_name("openHidden()")));
- (void)openError __attribute__((swift_name("openError()")));
- (void)openWarning __attribute__((swift_name("openWarning()")));
- (int32_t)openNormal __attribute__((swift_name("openNormal()")));
@property (readonly) id _Nullable openErrorVal __attribute__((swift_name("openErrorVal"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
@property id _Nullable openErrorVar __attribute__((swift_name("openErrorVar"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
@property (readonly) id _Nullable openWarningVal __attribute__((swift_name("openWarningVal"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
@property id _Nullable openWarningVar __attribute__((swift_name("openWarningVar"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
@property (readonly) id _Nullable openHiddenVal __attribute__((swift_name("openHiddenVal")));
@property id _Nullable openHiddenVar __attribute__((swift_name("openHiddenVar")));
@property (readonly) id _Nullable openErrorVal __attribute__((swift_name("openErrorVal")));
@property id _Nullable openErrorVar __attribute__((swift_name("openErrorVar")));
@property (readonly) id _Nullable openWarningVal __attribute__((swift_name("openWarningVal")));
@property id _Nullable openWarningVar __attribute__((swift_name("openWarningVar")));
@property (readonly) id _Nullable openNormalVal __attribute__((swift_name("openNormalVal")));
@property id _Nullable openNormalVar __attribute__((swift_name("openNormalVar")));
@end
kotlin-native/backend.native/tests/objcexport/expectedLazyNoGenerics.h
+9 -6
View File
@@ -2688,13 +2688,16 @@ __attribute__((swift_name("TestDeprecation.NormalOverride")))
- (instancetype)initWithNormal:(int64_t)normal __attribute__((swift_name("init(normal:)"))) __attribute__((objc_designated_initializer));
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (void)openError __attribute__((swift_name("openError()"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
- (void)openWarning __attribute__((swift_name("openWarning()"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
- (void)openHidden __attribute__((swift_name("openHidden()")));
- (void)openError __attribute__((swift_name("openError()")));
- (void)openWarning __attribute__((swift_name("openWarning()")));
- (int32_t)openNormal __attribute__((swift_name("openNormal()")));
@property (readonly) id _Nullable openErrorVal __attribute__((swift_name("openErrorVal"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
@property id _Nullable openErrorVar __attribute__((swift_name("openErrorVar"))) __attribute__((unavailable("Overrides deprecated member in 'conversions.TestDeprecation'. error")));
@property (readonly) id _Nullable openWarningVal __attribute__((swift_name("openWarningVal"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
@property id _Nullable openWarningVar __attribute__((swift_name("openWarningVar"))) __attribute__((deprecated("Overrides deprecated member in 'conversions.TestDeprecation'. warning")));
@property (readonly) id _Nullable openHiddenVal __attribute__((swift_name("openHiddenVal")));
@property id _Nullable openHiddenVar __attribute__((swift_name("openHiddenVar")));
@property (readonly) id _Nullable openErrorVal __attribute__((swift_name("openErrorVal")));
@property id _Nullable openErrorVar __attribute__((swift_name("openErrorVar")));
@property (readonly) id _Nullable openWarningVal __attribute__((swift_name("openWarningVal")));
@property id _Nullable openWarningVar __attribute__((swift_name("openWarningVar")));
@property (readonly) id _Nullable openNormalVal __attribute__((swift_name("openNormalVal")));
@property id _Nullable openNormalVar __attribute__((swift_name("openNormalVar")));
@end