Skip to content

Commit eb0520a

Browse files
authored
[Java.Interop.Tools.JavaCallableWrappers] Renumber XA4213 to XA4217 (#594)
Renumber XA4213 to XA4217 to remove a conflict with an earlier usage of XA4213 in [xamarin-android][0]. [0]: https://github.com/xamarin/xamarin-android/blob/1a6fcff8a5a68bc2b53afa948176dea9681ff0d0/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs#L323
1 parent b33d183 commit eb0520a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics/Diagnostic.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ namespace Java.Interop.Tools.Diagnostics {
103103
// XA4210 "You need to add a reference to Mono.Android.Export.dll when you use ExportAttribute or ExportFieldAttribute."
104104
// XA4211 AndroidManifest.xml //uses-sdk/@android:targetSdkVersion '{0}' is less than $(TargetFrameworkVersion) '{1}'. Using API-{1} for ACW compilation.
105105
// XA4212 Type `{0}` implements `Android.Runtime.IJavaObject` but does not inherit `Java.Lang.Object` or `Java.Lang.Throwable`. This is not supported.
106-
// XA4213 Cannot override Kotlin-generated method '{0}' because it is not a valid Java method name. This method can only be overridden from Kotlin."
106+
// XA4217 Cannot override Kotlin-generated method '{0}' because it is not a valid Java method name. This method can only be overridden from Kotlin."
107107
// XA5xxx GCC and toolchain
108108
// XA32xx .apk generation
109109
// XA4300 Unsupported $(AndroidSupportedAbis) value '{0}'; ignoring.

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void AddMethod (MethodDefinition registeredMethod, MethodDefinition implementedM
372372
foreach (RegisterAttribute attr in GetRegisterAttributes (registeredMethod)) {
373373
// Check for Kotlin-mangled methods that cannot be overridden
374374
if (attr.Name.Contains ("-impl") || (attr.Name.Length > 7 && attr.Name[attr.Name.Length - 8] == '-'))
375-
Diagnostic.Error (4213, LookupSource (implementedMethod), $"Cannot override Kotlin-generated method '{attr.Name}' because it is not a valid Java method name. This method can only be overridden from Kotlin.");
375+
Diagnostic.Error (4217, LookupSource (implementedMethod), $"Cannot override Kotlin-generated method '{attr.Name}' because it is not a valid Java method name. This method can only be overridden from Kotlin.");
376376

377377
var msig = new Signature (implementedMethod, attr);
378378
if (!registeredMethod.IsConstructor && !methods.Any (m => m.Name == msig.Name && m.Params == msig.Params))

tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.IO;
33
using System.Linq;
44
using System.Threading.Tasks;
@@ -38,7 +38,7 @@ public void KotlinInvalidImplRegisterName ()
3838
// Contains invalid [Register] name of "foo-impl"
3939
var td = SupportDeclarations.GetTypeDefinition (typeof (KotlinInvalidImplRegisterName));
4040
var e = Assert.Throws<XamarinAndroidException> (() => new JavaCallableWrapperGenerator (td, logger, cache: null));
41-
Assert.AreEqual (4213, e.Code);
41+
Assert.AreEqual (4217, e.Code);
4242
}
4343

4444
[Test]
@@ -49,7 +49,7 @@ public void KotlinInvalidHashRegisterName ()
4949
// Contains invalid [Register] name of "foo-f8k2a13"
5050
var td = SupportDeclarations.GetTypeDefinition (typeof (KotlinInvalidHashRegisterName));
5151
var e = Assert.Throws<XamarinAndroidException> (() => new JavaCallableWrapperGenerator (td, logger, cache: null));
52-
Assert.AreEqual (4213, e.Code);
52+
Assert.AreEqual (4217, e.Code);
5353
}
5454

5555
[Test]

0 commit comments

Comments
 (0)