From 7e8aa1e8844bc73a2d00dc3050202cc357307cca Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 13 Jun 2024 12:49:36 -0400 Subject: [PATCH] Update README.md --- CODE-OF-CONDUCT.md | 6 ++++++ README.md | 10 +++------- samples/Hello-NativeAOTFromJNI/README.md | 4 ++-- .../Java.Interop/JniRuntime.JniTypeManager.cs | 4 ++-- .../Java.Interop/JniRuntime.JniValueManager.cs | 4 ++-- src/java-interop/CMakeLists.txt | 2 +- .../JavaTypeCollectionTests.cs | 2 +- .../Unit-Tests/DefaultInterfaceMethodsTests.cs | 2 +- tools/param-name-importer/README.md | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 CODE-OF-CONDUCT.md diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md new file mode 100644 index 000000000..775f221c9 --- /dev/null +++ b/CODE-OF-CONDUCT.md @@ -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). diff --git a/README.md b/README.md index ede88b2f7..f646bf425 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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 @@ -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]. @@ -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. diff --git a/samples/Hello-NativeAOTFromJNI/README.md b/samples/Hello-NativeAOTFromJNI/README.md index 3494607bf..bd16e1fc1 100644 --- a/samples/Hello-NativeAOTFromJNI/README.md +++ b/samples/Hello-NativeAOTFromJNI/README.md @@ -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 @@ -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. diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs index 7d5584f9f..cc778dba7 100644 --- a/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs +++ b/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs @@ -272,14 +272,14 @@ protected virtual IEnumerable 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 diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs index cb044119b..263bbdf08 100644 --- a/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs +++ b/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs @@ -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 @@ -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 diff --git a/src/java-interop/CMakeLists.txt b/src/java-interop/CMakeLists.txt index a48c0b7b0..5ab5e2a6c 100644 --- a/src/java-interop/CMakeLists.txt +++ b/src/java-interop/CMakeLists.txt @@ -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 ) diff --git a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs index dbb53d96f..06faf1eb2 100644 --- a/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs +++ b/tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs @@ -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 diff --git a/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs b/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs index 0ba284a82..9b94acd88 100644 --- a/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs +++ b/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs @@ -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 = @" diff --git a/tools/param-name-importer/README.md b/tools/param-name-importer/README.md index 666a67e6a..fcfbbf56d 100644 --- a/tools/param-name-importer/README.md +++ b/tools/param-name-importer/README.md @@ -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