Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Code of Conduct

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community.

For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This allows one to bridge code running on .NET's CLR and code running on a Java
Note this does not mean that one can run Java code on .NET, or vice-versa.

**Java.Interop** currently does not ship independently. It is shipped as part of Microsoft's
[Xamarin.Android][xa] product, available via Visual Studio or .NET 6+. However, it is designed
[.NET for Android][android] product, available via Visual Studio or .NET 6+. However, it is designed
to be fully independent of Android and should be usable by other Java implementations.
For other uses, please compile and distribute from source.

Expand All @@ -19,7 +19,7 @@ and [Architecture][architecture] pages.
[jni]: http://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/jniTOC.html
[motivation]: /Documentation/Motivation.md
[architecture]: /Documentation/Architecture.md
[xa]: https://github.com/xamarin/xamarin-android
[android]: https://github.com/xamarin/xamarin-android

## Building

Expand All @@ -39,7 +39,7 @@ dotnet build
```

[net-7]: https://dotnet.microsoft.com/en-us/download/dotnet/7.0
[net-6]: https://github.com/xamarin/java.interop/tree/release/6.0.3xx
[net-6]: https://github.com/dotnet/java-interop/tree/release/6.0.3xx

Additional build options are documented [here][build-configuration].

Expand All @@ -53,10 +53,6 @@ This project welcomes issues and PRs.
- Discuss development and design on [Discord](https://aka.ms/dotnet-discord). [![Discord](https://img.shields.io/badge/chat-on%20discord-brightgreen)](https://aka.ms/dotnet-discord)
- Coding style is outlined in [Coding Guidelines](http://www.mono-project.com/community/contributing/coding-guidelines/).

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community. For more information, see the
[.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).

## License

Copyright (c) .NET Foundation Contributors. All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions samples/Hello-NativeAOTFromJNI/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Bring an example of the latter into a Java.Interop sample, using [NativeAOT][3].
## Building

Building a native library with NativeAOT requires a Release configuration build.
For in-repo use, that means that xamarin/Java.Interop itself needs to be built in
For in-repo use, that means that dotnet/java-interop itself needs to be built in
Release configuration:

```sh
Expand Down Expand Up @@ -83,7 +83,7 @@ With this sample "done" (-ish), there are some
## `Type.GetType()`

Commit
[xamarin/java.interop@005c9141](https://github.com/xamarin/java.interop/commit/005c914170a0af9069ff18fd4dd9d45463dd5dc6)
[dotnet/java-interop@005c9141](https://github.com/dotnet/java-interop/commit/005c914170a0af9069ff18fd4dd9d45463dd5dc6)
uses JNI Type Signatures to avoid `Type.GetType()` invocations, which continue
to be used in .NET Android.

Expand Down
4 changes: 2 additions & 2 deletions src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,14 @@ protected virtual IEnumerable<string> GetSimpleReferences (Type type)
const string NotUsedInAndroid = "This code path is not used in Android projects.";

static Type MakeArrayType (Type type) =>
// FIXME: https://github.com/xamarin/java.interop/issues/1192
// FIXME: https://github.com/dotnet/java-interop/issues/1192
#pragma warning disable IL3050
type.MakeArrayType ();
#pragma warning restore IL3050

[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = NotUsedInAndroid)]
static Type MakeGenericType (Type type, Type arrayType) =>
// FIXME: https://github.com/xamarin/java.interop/issues/1192
// FIXME: https://github.com/dotnet/java-interop/issues/1192
#pragma warning disable IL3050
type.MakeGenericType (arrayType);
#pragma warning restore IL3050
Expand Down
4 changes: 2 additions & 2 deletions src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ static Type MakeGenericType (
[DynamicallyAccessedMembers (Constructors)]
Type type,
Type [] arguments) =>
// FIXME: https://github.com/xamarin/java.interop/issues/1192
// FIXME: https://github.com/dotnet/java-interop/issues/1192
#pragma warning disable IL3050
type.MakeGenericType (arguments);
#pragma warning restore IL3050
Expand Down Expand Up @@ -660,7 +660,7 @@ static JniValueMarshaler GetObjectArrayMarshaler (Type elementType)

[UnconditionalSuppressMessage ("Trimming", "IL2060", Justification = makeGenericMethodMessage)]
static MethodInfo MakeGenericMethod (MethodInfo method, Type type) =>
// FIXME: https://github.com/xamarin/java.interop/issues/1192
// FIXME: https://github.com/dotnet/java-interop/issues/1192
#pragma warning disable IL3050
method.MakeGenericMethod (type);
#pragma warning restore IL3050
Expand Down
2 changes: 1 addition & 1 deletion src/java-interop/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 arm64)
project(
java-interop
DESCRIPTION "Java.Interop native support"
HOMEPAGE_URL "https://github.com/xamarin/java.interop/"
HOMEPAGE_URL "https://github.com/dotnet/java-interop/"
LANGUAGES CXX C
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void ResolveGenericArguments ()
[Test]
public void IntentServiceHack ()
{
// https://github.com/xamarin/java.interop/issues/717
// https://github.com/dotnet/java-interop/issues/717
var api = JavaApiTestHelper.GetLoadedApi ();

// Create "mono.android.app" package
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ public void DontInvalidateInterfaceDueToStaticOrDefaultMethods ()
[Test]
public void GenerateProperNestedInterfaceSignatures ()
{
// https://github.com/xamarin/java.interop/issues/661
// https://github.com/dotnet/java-interop/issues/661
// Ensure that when we write the invoker type for a nested default interface method
// we use `/` to denote nested as needed by Type.GetType ()
var xml = @"<api>
Expand Down
2 changes: 1 addition & 1 deletion tools/param-name-importer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ HtmlLoader.cs and those HTML DTD resources are from
https://github.com/xamarin/xamarin-android/tree/master/src/Xamarin.Android.Tools.JavadocImporter

JavaApi.XmlModel.cs is from here, with some minor changes:
https://github.com/xamarin/java.interop/blob/master/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs
https://github.com/dotnet/java-interop/blob/0cb8e2d3701d213bf3d662daa014707f53f96637/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs