Skip to content

Commit 4cd5711

Browse files
authored
Update README.md (#1227)
1 parent f935001 commit 4cd5711

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

CODE-OF-CONDUCT.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

README.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This allows one to bridge code running on .NET's CLR and code running on a Java
99
Note this does not mean that one can run Java code on .NET, or vice-versa.
1010

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

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

2424
## Building
2525

@@ -39,7 +39,7 @@ dotnet build
3939
```
4040

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

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

@@ -53,10 +53,6 @@ This project welcomes issues and PRs.
5353
- 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)
5454
- Coding style is outlined in [Coding Guidelines](http://www.mono-project.com/community/contributing/coding-guidelines/).
5555

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

6258
Copyright (c) .NET Foundation Contributors. All rights reserved.

samples/Hello-NativeAOTFromJNI/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Bring an example of the latter into a Java.Interop sample, using [NativeAOT][3].
1414
## Building
1515

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

2020
```sh
@@ -83,7 +83,7 @@ With this sample "done" (-ish), there are some
8383
## `Type.GetType()`
8484

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

src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,14 @@ protected virtual IEnumerable<string> GetSimpleReferences (Type type)
272272
const string NotUsedInAndroid = "This code path is not used in Android projects.";
273273

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

280280
[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = NotUsedInAndroid)]
281281
static Type MakeGenericType (Type type, Type arrayType) =>
282-
// FIXME: https://github.com/xamarin/java.interop/issues/1192
282+
// FIXME: https://github.com/dotnet/java-interop/issues/1192
283283
#pragma warning disable IL3050
284284
type.MakeGenericType (arrayType);
285285
#pragma warning restore IL3050

src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static Type MakeGenericType (
376376
[DynamicallyAccessedMembers (Constructors)]
377377
Type type,
378378
Type [] arguments) =>
379-
// FIXME: https://github.com/xamarin/java.interop/issues/1192
379+
// FIXME: https://github.com/dotnet/java-interop/issues/1192
380380
#pragma warning disable IL3050
381381
type.MakeGenericType (arguments);
382382
#pragma warning restore IL3050
@@ -660,7 +660,7 @@ static JniValueMarshaler GetObjectArrayMarshaler (Type elementType)
660660

661661
[UnconditionalSuppressMessage ("Trimming", "IL2060", Justification = makeGenericMethodMessage)]
662662
static MethodInfo MakeGenericMethod (MethodInfo method, Type type) =>
663-
// FIXME: https://github.com/xamarin/java.interop/issues/1192
663+
// FIXME: https://github.com/dotnet/java-interop/issues/1192
664664
#pragma warning disable IL3050
665665
method.MakeGenericMethod (type);
666666
#pragma warning restore IL3050

src/java-interop/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 arm64)
33
project(
44
java-interop
55
DESCRIPTION "Java.Interop native support"
6-
HOMEPAGE_URL "https://github.com/xamarin/java.interop/"
6+
HOMEPAGE_URL "https://github.com/dotnet/java-interop/"
77
LANGUAGES CXX C
88
)
99

tests/Java.Interop.Tools.JavaTypeSystem-Tests/JavaTypeCollectionTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void ResolveGenericArguments ()
5050
[Test]
5151
public void IntentServiceHack ()
5252
{
53-
// https://github.com/xamarin/java.interop/issues/717
53+
// https://github.com/dotnet/java-interop/issues/717
5454
var api = JavaApiTestHelper.GetLoadedApi ();
5555

5656
// Create "mono.android.app" package

tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ public void DontInvalidateInterfaceDueToStaticOrDefaultMethods ()
437437
[Test]
438438
public void GenerateProperNestedInterfaceSignatures ()
439439
{
440-
// https://github.com/xamarin/java.interop/issues/661
440+
// https://github.com/dotnet/java-interop/issues/661
441441
// Ensure that when we write the invoker type for a nested default interface method
442442
// we use `/` to denote nested as needed by Type.GetType ()
443443
var xml = @"<api>

tools/param-name-importer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ HtmlLoader.cs and those HTML DTD resources are from
44
https://github.com/xamarin/xamarin-android/tree/master/src/Xamarin.Android.Tools.JavadocImporter
55

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

0 commit comments

Comments
 (0)