Skip to content

Commit 8eae534

Browse files
committed
use Xamarin.Brotli.Dec
1 parent db9ef11 commit 8eae534

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- Square.OkHttp3.JVM 5.1.0.2 (replaces Square.OkHttp3)
1010
- Square.OkHttp3.JavaNetCookieJar 5.1.0.2 (replaces Square.OkHttp3.UrlConnection)
1111
- Square.OkIO 3.16.0
12+
- Xamarin.Brotli.Dec 0.1.2.9 (replaces manual jar import)
1213
- test : Microsoft.Extensions.DependencyInjection 9.0.8
1314
- test : Microsoft.Extensions.Logging 9.0.8
1415
- test : Microsoft.Maui.* 9.0.100

SecureHttpClient.OkHttp/SecureHttpClient.OkHttp.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Square.OkHttp3.JVM" Version="5.1.0.2" />
11+
<PackageReference Include="Xamarin.Brotli.Dec" Version="0.1.2.9" />
1112
</ItemGroup>
1213

1314
<ItemGroup>
1415
<AndroidLibrary Include="Jars\securehttpclient-okhttp.jar" />
1516
</ItemGroup>
1617

17-
<ItemGroup>
18-
<AndroidLibrary Update="import\org.brotli.dec-0.1.2.jar" Bind="false" />
19-
</ItemGroup>
20-
2118
<ItemGroup>
2219
<AndroidJavaSource Remove="java\**" />
2320
</ItemGroup>

SecureHttpClient.OkHttp/java/buildjar.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ bitsadmin.exe /transfer "Download okio-jvm %Version_Okio%" https://repo1.maven.o
1717
bitsadmin.exe /transfer "Download kotlin-stdlib %Version_KotlinStdlib%" https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/%Version_KotlinStdlib%/kotlin-stdlib-%Version_KotlinStdlib%.jar "%~dp0\jars\kotlin-stdlib-%Version_KotlinStdlib%.jar"
1818
bitsadmin.exe /transfer "Download org.brotli.dec %Version_Brotli%" https://repo1.maven.org/maven2/org/brotli/dec/%Version_Brotli%/dec-%Version_Brotli%.jar "%~dp0\jars\org.brotli.dec-%Version_Brotli%.jar"
1919

20-
echo -- COPY IMPORTS --------------------------------------------------------------------------------------------------------------------------------------------
21-
copy "%~dp0\jars\org.brotli.dec-%Version_Brotli%.jar" ..\import\org.brotli.dec-%Version_Brotli%.jar
22-
2320
echo -- BUILD JAVA ----------------------------------------------------------------------------------------------------------------------------------------------
2421
javac -Xlint:all -classpath jars/* *.java
2522

build/SecureHttpClient.nuspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<dependency id="Square.OkHttp3.JVM" version="5.1.0.2" exclude="Build,Analyzers" />
2525
<dependency id="Square.OkHttp3.JavaNetCookieJar" version="5.1.0.2" exclude="Build,Analyzers" />
2626
<dependency id="Square.OkIO" version="3.16.0" exclude="Build,Analyzers" />
27+
<dependency id="Xamarin.Brotli.Dec" version="0.1.2.9" exclude="Build,Analyzers" />
2728
</group>
2829
<group targetFramework="net9.0-ios18.5">
2930
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="9.0.8" exclude="Build,Analyzers" />

0 commit comments

Comments
 (0)