Skip to content

Commit

Permalink
IKVM 8.7, other NuGet upgrades (#84)
Browse files Browse the repository at this point in the history
* Update README and CONTRIBUTING with project name and Markdown style

* Upgrade IKVM to 8.7.0-pre.2 for macOS arm64 support, #81

* Upgrade IKVM to 8.7.1, other NuGet upgrades, fix app name on macOS
  • Loading branch information
paulirwin authored Nov 27, 2023
1 parent db0b3eb commit 5d8ee4f
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 23 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing to JavaParser
# Contributing to JavaToCSharp

Thank you for your interest in helping this project grow!
Here are some general guidelines to follow when contributing to JavaParser:
Here are some general guidelines to follow when contributing to JavaToCSharp:

- Please file an issue before submitting a PR, and reference the issue from your PR.
The issue should clearly outline the problem or feature request, what benefits it provides, etc.
Expand Down
8 changes: 4 additions & 4 deletions JavaToCSharp.Tests/JavaToCSharp.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="IKVM" Version="8.6.2" />
<PackageReference Include="IKVM" Version="8.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions JavaToCSharp/JavaToCSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<None Include="..\.editorconfig" Link=".editorconfig" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="IKVM" Version="8.6.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="IKVM" Version="8.7.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<IkvmReference Include="../Lib/javaparser-core-3.25.4.jar" />
Expand Down
2 changes: 1 addition & 1 deletion JavaToCSharpCli/JavaToCSharpCli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<WarningsAsErrors>nullable</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions JavaToCSharpGui/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="JavaToCSharpGui.App"
xmlns:local="using:JavaToCSharpGui"
Name="Java to C#"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
<Application.Styles>
Expand Down
14 changes: 7 additions & 7 deletions JavaToCSharpGui/JavaToCSharpGui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
</ItemGroup>
<ItemGroup>
<!-- Removes version conflict error -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />

<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />

<PackageReference Include="Avalonia" Version="11.0.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" />
<PackageReference Include="Avalonia" Version="11.0.5" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.5" />
<PackageReference Include="Semi.Avalonia" Version="11.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Java to C# Converter
====================
# Java to C# Converter

[![.NET Build](https://github.com/paulirwin/JavaToCSharp/actions/workflows/build.yml/badge.svg)](https://github.com/paulirwin/JavaToCSharp/actions/workflows/build.yml) [![Nuget](https://img.shields.io/nuget/v/JavaToCSharp)](https://www.nuget.org/packages/JavaToCSharp/)

Expand All @@ -11,8 +10,7 @@ and [Roslyn](https://github.com/dotnet/roslyn) for C# AST generation.

Pull requests and issue submission welcome.

Getting Started
===============
## Getting Started

Clone the repo, build, and launch the Gui WPF app. Click the "..." button on
the left side to load a Java file, and then click Convert to convert to
Expand All @@ -24,7 +22,6 @@ from the command line.

The core library is installable via NuGet at https://www.nuget.org/packages/JavaToCSharp/

License for JavaParser
======================
## License for JavaParser

Licensed under the Apache License available at https://github.com/javaparser/javaparser/blob/master/LICENSE.APACHE

0 comments on commit 5d8ee4f

Please sign in to comment.