Skip to content

Commit 1c15e45

Browse files
authored
Update java-interop and android-tools submodule mentions (#9023)
1 parent d6e47a8 commit 1c15e45

File tree

12 files changed

+25
-26
lines changed

12 files changed

+25
-26
lines changed

.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/xamarin/java.interop/wiki/Troubleshooting-Android-Bindings-Issues).
9+
Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/dotnet/java-interop/wiki/Troubleshooting-Android-Bindings-Issues).
1010
1111
If you get stuck troubleshooting an issue, please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker.
1212
- type: dropdown

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
branch = main
1313
[submodule "external/Java.Interop"]
1414
path = external/Java.Interop
15-
url = https://github.com/xamarin/java.interop.git
15+
url = https://github.com/dotnet/java-interop
1616
branch = main
1717
[submodule "external/libunwind"]
1818
path = external/libunwind
@@ -28,7 +28,7 @@
2828
branch = master
2929
[submodule "external/xamarin-android-tools"]
3030
path = external/xamarin-android-tools
31-
url = https://github.com/xamarin/xamarin-android-tools
31+
url = https://github.com/dotnet/android-tools
3232
branch = main
3333
[submodule "external/xxHash"]
3434
path = external/xxHash

Documentation/release-notes/5945.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#### Bindings projects
22

3-
- [GitHub Issue #835](https://github.com/xamarin/java.interop/issues/835):
3+
- [GitHub Issue #835](https://github.com/dotnet/java-interop/issues/835):
44
Don't throw an `IndexOutOfRangeException` if a Java type ends with `.` or `$`.
55

66
- [GitHub Issue #5821](https://github.com/xamarin/xamarin-android/issues/5921)

Documentation/release-notes/README.md

+10-11
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ items.
3737
Changes for One .NET should have neither label for now because they are not yet
3838
user-facing.
3939

40-
PRs that bump Java.Interop, xamarin-android-tools, or monodroid generally don't
40+
PRs that bump Java.Interop, android-tools, or monodroid generally don't
4141
need to be labeled, but Mono bumps that include changes that could affect
4242
Android users should be labeled.
4343

@@ -123,7 +123,7 @@ Examples:
123123
```markdown
124124
### Build and deployment performance
125125

126-
- [Java.Interop GitHub PR 596](https://github.com/xamarin/java.interop/pull/596):
126+
- [Java.Interop GitHub PR 596](https://github.com/dotnet/java-interop/pull/596):
127127
Use `File.Exists()` instead of `DirectoryGetFile()` in a few places. This
128128
reduced the time for the `LinkAssembliesNoShrink` task from about 710
129129
milliseconds to about 430 milliseconds for a small test Xamarin.Forms app on
@@ -191,19 +191,19 @@ Example showing multiple release notes sections for a Java.Interop bump:
191191
```markdown
192192
### Build and deployment performance
193193

194-
- [Java.Interop GitHub PR 440](https://github.com/xamarin/java.interop/pull/440),
195-
[Java.Interop GitHub PR 441](https://github.com/xamarin/java.interop/pull/441),
196-
[Java.Interop GitHub PR 442](https://github.com/xamarin/java.interop/pull/442),
197-
[Java.Interop GitHub PR 448](https://github.com/xamarin/java.interop/pull/448),
198-
[Java.Interop GitHub PR 449](https://github.com/xamarin/java.interop/pull/449),
199-
[Java.Interop GitHub PR 452](https://github.com/xamarin/java.interop/pull/452):
194+
- [Java.Interop GitHub PR 440](https://github.com/dotnet/java-interop/pull/440),
195+
[Java.Interop GitHub PR 441](https://github.com/dotnet/java-interop/pull/441),
196+
[Java.Interop GitHub PR 442](https://github.com/dotnet/java-interop/pull/442),
197+
[Java.Interop GitHub PR 448](https://github.com/dotnet/java-interop/pull/448),
198+
[Java.Interop GitHub PR 449](https://github.com/dotnet/java-interop/pull/449),
199+
[Java.Interop GitHub PR 452](https://github.com/dotnet/java-interop/pull/452):
200200
Optimize several of the build steps for bindings projects. For a large
201201
binding like _Mono.Android.dll_ itself, this reduced the total build time in a
202202
test environment by about 50 seconds.
203203

204204
#### Bindings projects
205205

206-
- [Java.Interop GitHub PR 458](https://github.com/xamarin/java.interop/pull/458):
206+
- [Java.Interop GitHub PR 458](https://github.com/dotnet/java-interop/pull/458):
207207
Bindings projects did not yet automatically generate event handlers for Java
208208
listener interfaces where the _add_ or _set_ method of the interface took two
209209
arguments instead of just one.
@@ -381,8 +381,7 @@ added to `Documentation/release-notes/images/`.
381381

382382
(For versions before 11.2, the milestone had a slightly different format.)
383383

384-
Complete this step for xamarin-android, Java.Interop, and
385-
xamarin-android-tools.
384+
Complete this step for xamarin-android, Java.Interop, and android-tools.
386385

387386
See also the [_How to make bulk changes on pull requests and issues_][bulk-change]
388387
section for tips on how to complete this step.

build-tools/xaprepare/xaprepare/ThirdPartyNotices/Java.Interop.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class JavaInterop_External_Dependencies_Group : ThirdPartyNoticeGroup
2323

2424
class JavaInterop_xamarin_Java_Interop_TPN : ThirdPartyNotice
2525
{
26-
static readonly Uri url = new Uri ("https://github.com/xamarin/Java.Interop/");
26+
static readonly Uri url = new Uri ("https://github.com/dotnet/java-interop/");
2727
static readonly string licenseFile = Path.Combine (Configurables.Paths.ExternalJavaInteropDir, "LICENSE");
2828

2929
public override string LicenseFile => licenseFile;
30-
public override string Name => "xamarin/Java.Interop";
30+
public override string Name => "dotnet/java-interop";
3131
public override Uri SourceUrl => url;
3232
public override string LicenseText => String.Empty;
3333
}
@@ -70,7 +70,7 @@ POSSIBILITY OF SUCH DAMAGE.
7070
";
7171
}
7272

73-
// via: https://github.com/xamarin/java.interop/blob/b588ef502d8d3b4c32e0ad731115e1b71fd56b5c/tools/java-source-utils/build.gradle#L33-L34
73+
// via: https://github.com/dotnet/java-interop/blob/b588ef502d8d3b4c32e0ad731115e1b71fd56b5c/tools/java-source-utils/build.gradle#L33-L34
7474
class JavaInterop_javaparser_javaparser_TPN : ThirdPartyNotice
7575
{
7676
static readonly Uri url = new Uri ("https://github.com/javaparser/javaparser/");

src/Mono.Android/Mono.Android.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
1919
<JavaCallableWrapperAfterTargets>CoreBuild</JavaCallableWrapperAfterTargets>
2020
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21-
<!-- @(Compile) ordering matters! See https://github.com/xamarin/java.interop/commit/d7dfa0bb7b03261d5eceb51ac22cd33aa15fa865 -->
21+
<!-- @(Compile) ordering matters! See https://github.com/dotnet/java-interop/commit/d7dfa0bb7b03261d5eceb51ac22cd33aa15fa865 -->
2222
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
2323
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
2424
<Nullable>enable</Nullable>

src/Mono.Android/metadata

+1-1
Original file line numberDiff line numberDiff line change
@@ -1693,7 +1693,7 @@
16931693

16941694
<!-- If you try to implement ICursor in API-30+, we generate an invalid invoker for this method due to the
16951695
generic parameters. Since this is a default method we can just remove it until that bug is fixed.
1696-
https://github.com/xamarin/java.interop/issues/699 -->
1696+
https://github.com/dotnet/java-interop/issues/699 -->
16971697
<remove-node api-since="30" path="/api/package[@name='android.database']/interface[@name='Cursor']/method[@name='setNotificationUris' and count(parameter)=2 and parameter[1][@type='android.content.ContentResolver'] and parameter[2][@type='java.util.List&lt;android.net.Uri&gt;']]" />
16981698
<remove-node api-since="30" path="/api/package[@name='android.database']/interface[@name='Cursor']/method[@name='getNotificationUris']" />
16991699

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Extensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public static bool TryGetMarshalMethod (this MethodDefinition method, string nat
333333
return false;
334334
}
335335

336-
// Keep in sync with: https://github.com/xamarin/java.interop/blob/8ccb8374d242490d8d1b032f2c8ca7a813fd40f3/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs#L405-L421
336+
// Keep in sync with: https://github.com/dotnet/java-interop/blob/8ccb8374d242490d8d1b032f2c8ca7a813fd40f3/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs#L405-L421
337337
public static string GetMarshalMethodName (string name, string signature)
338338
{
339339
if (name == null)

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ protected string CreateFauxJavaSdkDirectory (string path, string javaVersion, ou
270270
return javaPath;
271271
}
272272

273-
// https://github.com/xamarin/xamarin-android-tools/blob/683f37508b56c76c24b3287a5687743438625341/tests/Xamarin.Android.Tools.AndroidSdk-Tests/JdkInfoTests.cs#L60-L100
273+
// https://github.com/dotnet/android-tools/blob/683f37508b56c76c24b3287a5687743438625341/tests/Xamarin.Android.Tools.AndroidSdk-Tests/JdkInfoTests.cs#L60-L100
274274
void CreateFauxJdk (string dir, string releaseVersion, string releaseBuildNumber, string javaVersion, string[] extraPrefix)
275275
{
276276
Directory.CreateDirectory (dir);
@@ -321,7 +321,7 @@ void CreateFauxJdk (string dir, string releaseVersion, string releaseBuildNumber
321321
CreateShellScript (Path.Combine (jre, "jvm.dll"), "");
322322
}
323323

324-
// https://github.com/xamarin/xamarin-android-tools/blob/683f37508b56c76c24b3287a5687743438625341/tests/Xamarin.Android.Tools.AndroidSdk-Tests/JdkInfoTests.cs#L108-L132
324+
// https://github.com/dotnet/android-tools/blob/683f37508b56c76c24b3287a5687743438625341/tests/Xamarin.Android.Tools.AndroidSdk-Tests/JdkInfoTests.cs#L108-L132
325325
void CreateShellScript (string path, string contents)
326326
{
327327
if (IsWindows && string.Compare (Path.GetExtension (path), ".dll", StringComparison.OrdinalIgnoreCase) != 0)

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<!-- Android Sdk Tool versions are sourced from this file. This is maintained in the xamarin-android-tools repo. -->
2+
<!-- Android Sdk Tool versions are sourced from this file. This is maintained in the android-tools repo. -->
33
<Import Project="$(MSBuildThisFileDirectory)\Xamarin.Android.Tools.Versions.props" />
44
<PropertyGroup>
55
<_JavaInteropReferences>Java.Interop;System.Runtime</_JavaInteropReferences>

src/native/monodroid/internal-pinvoke-api.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports)
324324

325325
/*
326326
this function is used from JavaInterop and should be treated as public API
327-
https://github.com/xamarin/java.interop/blob/master/src/java-interop/java-interop-gc-bridge-mono.c#L266
327+
https://github.com/dotnet/java-interop/blob/master/src/java-interop/java-interop-gc-bridge-mono.c#L266
328328
329329
it should also accept libmono_path = nullptr parameter
330330
*/

src/native/monodroid/pinvoke-override-api.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports)
327327

328328
/*
329329
this function is used from JavaInterop and should be treated as public API
330-
https://github.com/xamarin/java.interop/blob/master/src/java-interop/java-interop-gc-bridge-mono.c#L266
330+
https://github.com/dotnet/java-interop/blob/master/src/java-interop/java-interop-gc-bridge-mono.c#L266
331331
332332
it should also accept libmono_path = nullptr parameter
333333
*/

0 commit comments

Comments
 (0)