diff --git a/Android/SquareOkHttp/build.cake b/Android/SquareOkHttp/build.cake index a256e347d6..36623b725a 100644 --- a/Android/SquareOkHttp/build.cake +++ b/Android/SquareOkHttp/build.cake @@ -1,19 +1,25 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var NUGET_VERSION = "2.7.5.1"; +var NUGET_VERSION = "2.7.5.2"; var JAR_VERSION = "2.7.5"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar"; +var JAR_OKHTTP_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar"; +var JAR_OKHTTP_URLCONNECTION_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp/okhttp-urlconnection/{JAR_VERSION}/okhttp-urlconnection-{JAR_VERSION}.jar"; +var JAR_OKHTTP_WS_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp/okhttp-ws/{JAR_VERSION}/okhttp-ws-{JAR_VERSION}.jar"; Task ("externals") .Does (() => { EnsureDirectoryExists ("./externals"); - DownloadFile(JAR_URL, "./externals/okhttp.jar"); + DownloadFile(JAR_OKHTTP_URL, "./externals/okhttp.jar"); + DownloadFile(JAR_OKHTTP_URLCONNECTION_URL, "./externals/okhttp-urlconnection.jar"); + DownloadFile(JAR_OKHTTP_WS_URL, "./externals/okhttp-ws.jar"); // Update .csproj nuget versions XmlPoke("./source/Square.OkHttp/Square.OkHttp.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); + XmlPoke("./source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); + XmlPoke("./source/Square.OkHttp.WS/Square.OkHttp.WS.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); }); Task("nuget") diff --git a/Android/SquareOkHttp/cgmanifest.json b/Android/SquareOkHttp/cgmanifest.json index 4dfb683be5..2784ff53cf 100644 --- a/Android/SquareOkHttp/cgmanifest.json +++ b/Android/SquareOkHttp/cgmanifest.json @@ -10,6 +10,28 @@ "NuGetId": "Square.OkHttp3" } } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "okhttp-urlconnection", + "GroupId": "com.squareup.okhttp", + "Version": "2.7.5", + "NuGetId": "Square.OkHttp.UrlConnection" + } + } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "okhttp-ws", + "GroupId": "com.squareup.okhttp", + "Version": "2.7.5", + "NuGetId": "Square.OkHttp.WS" + } + } } ], "Version": 1 diff --git a/Android/SquareOkHttp/samples/OkHttpSample.sln b/Android/SquareOkHttp/samples/OkHttpSample.sln index f3acde9b44..763154b745 100644 --- a/Android/SquareOkHttp/samples/OkHttpSample.sln +++ b/Android/SquareOkHttp/samples/OkHttpSample.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OkHttpSample", "OkHttpSampl EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp", "..\source\Square.OkHttp\Square.OkHttp.csproj", "{47225658-05B3-4F0D-A040-6A22E238F4B0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp.WS", "..\source\Square.OkHttp.WS\Square.OkHttp.WS.csproj", "{04A89A26-C768-4AB2-87F1-8392DF4258F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {47225658-05B3-4F0D-A040-6A22E238F4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {47225658-05B3-4F0D-A040-6A22E238F4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {47225658-05B3-4F0D-A040-6A22E238F4B0}.Release|Any CPU.Build.0 = Release|Any CPU + {04A89A26-C768-4AB2-87F1-8392DF4258F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04A89A26-C768-4AB2-87F1-8392DF4258F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04A89A26-C768-4AB2-87F1-8392DF4258F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04A89A26-C768-4AB2-87F1-8392DF4258F5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Android/SquareOkHttp/samples/OkHttpSample/OkHttpSample.csproj b/Android/SquareOkHttp/samples/OkHttpSample/OkHttpSample.csproj index e6a0e95d11..6cdff07f74 100644 --- a/Android/SquareOkHttp/samples/OkHttpSample/OkHttpSample.csproj +++ b/Android/SquareOkHttp/samples/OkHttpSample/OkHttpSample.csproj @@ -13,7 +13,7 @@ true Resources\Resource.Designer.cs Off - v9.0 + v10.0 Properties\AndroidManifest.xml armeabi-v7a;x86;arm64-v8a;x86_64 @@ -27,6 +27,7 @@ 4 None dx + true full diff --git a/Android/SquareOkHttp/samples/OkHttpSample/Properties/AndroidManifest.xml b/Android/SquareOkHttp/samples/OkHttpSample/Properties/AndroidManifest.xml index 8dabdf18a9..f1cddf5879 100644 --- a/Android/SquareOkHttp/samples/OkHttpSample/Properties/AndroidManifest.xml +++ b/Android/SquareOkHttp/samples/OkHttpSample/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/MainActivity.cs b/Android/SquareOkHttp/samples/OkHttpWSSample/MainActivity.cs similarity index 100% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/MainActivity.cs rename to Android/SquareOkHttp/samples/OkHttpWSSample/MainActivity.cs diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/OkHttpWSSample.csproj b/Android/SquareOkHttp/samples/OkHttpWSSample/OkHttpWSSample.csproj similarity index 89% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/OkHttpWSSample.csproj rename to Android/SquareOkHttp/samples/OkHttpWSSample/OkHttpWSSample.csproj index 37f4b30c57..f377617875 100644 --- a/Android/SquareOkHttpWS/samples/OkHttpWSSample/OkHttpWSSample.csproj +++ b/Android/SquareOkHttp/samples/OkHttpWSSample/OkHttpWSSample.csproj @@ -13,7 +13,7 @@ true Resources\Resource.Designer.cs Off - v9.0 + v10.0 Properties\AndroidManifest.xml armeabi-v7a;x86;arm64-v8a;x86_64 @@ -26,6 +26,7 @@ prompt 4 None + true full @@ -50,9 +51,6 @@ - - 2.7.5.1 - @@ -69,9 +67,13 @@ - {15F960CA-7894-42F1-A7D1-53E46935D39B} + {04A89A26-C768-4AB2-87F1-8392DF4258F5} Square.OkHttp.WS + + {47225658-05B3-4F0D-A040-6A22E238F4B0} + Square.OkHttp + \ No newline at end of file diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/Properties/AndroidManifest.xml b/Android/SquareOkHttp/samples/OkHttpWSSample/Properties/AndroidManifest.xml similarity index 98% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/Properties/AndroidManifest.xml rename to Android/SquareOkHttp/samples/OkHttpWSSample/Properties/AndroidManifest.xml index 0fdd1f9d67..1c505524a3 100644 --- a/Android/SquareOkHttpWS/samples/OkHttpWSSample/Properties/AndroidManifest.xml +++ b/Android/SquareOkHttp/samples/OkHttpWSSample/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/Properties/AssemblyInfo.cs b/Android/SquareOkHttp/samples/OkHttpWSSample/Properties/AssemblyInfo.cs similarity index 100% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/Properties/AssemblyInfo.cs rename to Android/SquareOkHttp/samples/OkHttpWSSample/Properties/AssemblyInfo.cs diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/Resources/drawable/Icon.png b/Android/SquareOkHttp/samples/OkHttpWSSample/Resources/drawable/Icon.png similarity index 100% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/Resources/drawable/Icon.png rename to Android/SquareOkHttp/samples/OkHttpWSSample/Resources/drawable/Icon.png diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/Resources/layout/Main.axml b/Android/SquareOkHttp/samples/OkHttpWSSample/Resources/layout/Main.axml similarity index 100% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/Resources/layout/Main.axml rename to Android/SquareOkHttp/samples/OkHttpWSSample/Resources/layout/Main.axml diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample/Resources/values/Strings.xml b/Android/SquareOkHttp/samples/OkHttpWSSample/Resources/values/Strings.xml similarity index 100% rename from Android/SquareOkHttpWS/samples/OkHttpWSSample/Resources/values/Strings.xml rename to Android/SquareOkHttp/samples/OkHttpWSSample/Resources/values/Strings.xml diff --git a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj b/Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj similarity index 79% rename from Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj rename to Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj index 54b5284b63..409bfbead0 100644 --- a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj +++ b/Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj @@ -1,6 +1,6 @@ - + - monoandroid9.0 + monoandroid10.0 true Square.OkHttp.UrlConnection Square.OkHttp.UrlConnection @@ -23,22 +23,21 @@ LICENSE.md true okhttp square square.okhttp xamarin android monodroid - 2.7.5.1 - - - - - + 2.7.5.2 + - - + + + + + \ No newline at end of file diff --git a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumFields.xml b/Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Transforms/EnumFields.xml similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumFields.xml rename to Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Transforms/EnumFields.xml diff --git a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumMethods.xml b/Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Transforms/EnumMethods.xml similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumMethods.xml rename to Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Transforms/EnumMethods.xml diff --git a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Transforms/Metadata.xml b/Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Transforms/Metadata.xml similarity index 100% rename from Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Transforms/Metadata.xml rename to Android/SquareOkHttp/source/Square.OkHttp.UrlConnection/Transforms/Metadata.xml diff --git a/Android/SquareOkHttpWS/source/Square.OkHttp.WS/Call.cs b/Android/SquareOkHttp/source/Square.OkHttp.WS/Call.cs similarity index 100% rename from Android/SquareOkHttpWS/source/Square.OkHttp.WS/Call.cs rename to Android/SquareOkHttp/source/Square.OkHttp.WS/Call.cs diff --git a/Android/SquareOkHttpWS/source/Square.OkHttp.WS/Square.OkHttp.WS.csproj b/Android/SquareOkHttp/source/Square.OkHttp.WS/Square.OkHttp.WS.csproj similarity index 72% rename from Android/SquareOkHttpWS/source/Square.OkHttp.WS/Square.OkHttp.WS.csproj rename to Android/SquareOkHttp/source/Square.OkHttp.WS/Square.OkHttp.WS.csproj index 32dff19c6a..02e777b95e 100644 --- a/Android/SquareOkHttpWS/source/Square.OkHttp.WS/Square.OkHttp.WS.csproj +++ b/Android/SquareOkHttp/source/Square.OkHttp.WS/Square.OkHttp.WS.csproj @@ -1,6 +1,6 @@ - + - monoandroid9.0 + monoandroid10.0 true Square.OkHttp.WS Square.OkHttp.WS @@ -19,26 +19,25 @@ Microsoft © Microsoft Corporation. All rights reserved. https://go.microsoft.com/fwlink/?linkid=2130312 - https://raw.githubusercontent.com/xamarin/XamarinComponents/master/Android/SquareOkHttpWS/icons/square.okhttp.ws_256x256.png + square.okhttp_256x256.png LICENSE.md true websocket okhttp square square.okhttp xamarin android monodroid - 2.7.5.1 + 2.7.5.2 - - - - - + - - + + + + + \ No newline at end of file diff --git a/Android/SquareOkHttpWS/source/Square.OkHttp.WS/Transforms/EnumFields.xml b/Android/SquareOkHttp/source/Square.OkHttp.WS/Transforms/EnumFields.xml similarity index 100% rename from Android/SquareOkHttpWS/source/Square.OkHttp.WS/Transforms/EnumFields.xml rename to Android/SquareOkHttp/source/Square.OkHttp.WS/Transforms/EnumFields.xml diff --git a/Android/SquareOkHttpWS/source/Square.OkHttp.WS/Transforms/EnumMethods.xml b/Android/SquareOkHttp/source/Square.OkHttp.WS/Transforms/EnumMethods.xml similarity index 100% rename from Android/SquareOkHttpWS/source/Square.OkHttp.WS/Transforms/EnumMethods.xml rename to Android/SquareOkHttp/source/Square.OkHttp.WS/Transforms/EnumMethods.xml diff --git a/Android/SquareOkHttpWS/source/Square.OkHttp.WS/Transforms/Metadata.xml b/Android/SquareOkHttp/source/Square.OkHttp.WS/Transforms/Metadata.xml similarity index 100% rename from Android/SquareOkHttpWS/source/Square.OkHttp.WS/Transforms/Metadata.xml rename to Android/SquareOkHttp/source/Square.OkHttp.WS/Transforms/Metadata.xml diff --git a/Android/SquareOkHttp/source/Square.OkHttp.sln b/Android/SquareOkHttp/source/Square.OkHttp.sln index 1ca890c950..3b1567d3cf 100644 --- a/Android/SquareOkHttp/source/Square.OkHttp.sln +++ b/Android/SquareOkHttp/source/Square.OkHttp.sln @@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp", "Square.OkHttp\Square.OkHttp.csproj", "{57FB9D46-F6EB-49B7-AF8C-06E063961F3A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp.WS", "Square.OkHttp.WS\Square.OkHttp.WS.csproj", "{8BB7484D-43F5-4C1C-953F-6FF83AFA177D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp.UrlConnection", "Square.OkHttp.UrlConnection\Square.OkHttp.UrlConnection.csproj", "{5EA8F782-B5F1-481D-9BCC-0209F0969F81}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -13,5 +17,13 @@ Global {57FB9D46-F6EB-49B7-AF8C-06E063961F3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {57FB9D46-F6EB-49B7-AF8C-06E063961F3A}.Release|Any CPU.ActiveCfg = Release|Any CPU {57FB9D46-F6EB-49B7-AF8C-06E063961F3A}.Release|Any CPU.Build.0 = Release|Any CPU + {8BB7484D-43F5-4C1C-953F-6FF83AFA177D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BB7484D-43F5-4C1C-953F-6FF83AFA177D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BB7484D-43F5-4C1C-953F-6FF83AFA177D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB7484D-43F5-4C1C-953F-6FF83AFA177D}.Release|Any CPU.Build.0 = Release|Any CPU + {5EA8F782-B5F1-481D-9BCC-0209F0969F81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EA8F782-B5F1-481D-9BCC-0209F0969F81}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EA8F782-B5F1-481D-9BCC-0209F0969F81}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EA8F782-B5F1-481D-9BCC-0209F0969F81}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Android/SquareOkHttp/source/Square.OkHttp/Square.OkHttp.csproj b/Android/SquareOkHttp/source/Square.OkHttp/Square.OkHttp.csproj index ae53c68f6a..9b4c1abbea 100644 --- a/Android/SquareOkHttp/source/Square.OkHttp/Square.OkHttp.csproj +++ b/Android/SquareOkHttp/source/Square.OkHttp/Square.OkHttp.csproj @@ -1,6 +1,6 @@ - + - monoandroid9.0 + monoandroid10.0 true Square.OkHttp Square.OkHttp @@ -19,11 +19,11 @@ Microsoft © Microsoft Corporation. All rights reserved. https://go.microsoft.com/fwlink/?linkid=2130312 - https://raw.githubusercontent.com/xamarin/XamarinComponents/master/Android/SquareOkHttp/icons/square.okhttp_256x256.png + square.okhttp_256x256.png LICENSE.md true okhttp square square.okhttp xamarin android monodroid - 2.7.5.1 + 2.7.5.2 @@ -33,11 +33,11 @@ - - + + \ No newline at end of file diff --git a/Android/SquareOkHttp3-v3/build.cake b/Android/SquareOkHttp3-v3/build.cake index 418cbebb97..762acc0852 100644 --- a/Android/SquareOkHttp3-v3/build.cake +++ b/Android/SquareOkHttp3-v3/build.cake @@ -1,22 +1,28 @@ var TARGET = Argument ("t", Argument ("target", "ci")); // this is used for the NuGet diff as v4 is a major changes -var NUGET_OLD_VERSION = "3.14.4"; +var NUGET_OLD_VERSION = "3.14.9"; -var NUGET_VERSION = "3.14.9"; +var NUGET_VERSION = "3.14.9.1"; var JAR_VERSION = "3.14.9"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar"; +var JAR_OKHTTP_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar"; +var JAR_OKHTTP_URLCONNECTION_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/{JAR_VERSION}/okhttp-urlconnection-{JAR_VERSION}.jar"; +var JAR_OKHTTP_LOGGING_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor/{JAR_VERSION}/logging-interceptor-{JAR_VERSION}.jar"; Task ("externals") .Does (() => { EnsureDirectoryExists ("./externals"); - DownloadFile(JAR_URL, "./externals/okhttp3.jar"); + DownloadFile(JAR_OKHTTP_URL, "./externals/okhttp3.jar"); + DownloadFile(JAR_OKHTTP_URLCONNECTION_URL, "./externals/okhttp3-urlconnection.jar"); + DownloadFile(JAR_OKHTTP_LOGGING_URL, "./externals/okhttp3-logging-interceptor.jar"); // Update .csproj nuget versions XmlPoke("./source/Square.OkHttp3/Square.OkHttp3.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); + XmlPoke("./source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); + XmlPoke("./source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); }); Task("nuget") @@ -35,6 +41,8 @@ Task("nuget") }); System.IO.File.WriteAllText($"./output/Square.OkHttp3.{NUGET_VERSION}.nupkg.baseversion", NUGET_OLD_VERSION); + System.IO.File.WriteAllText($"./output/Square.OkHttp3.UrlConnection.{NUGET_VERSION}.nupkg.baseversion", NUGET_OLD_VERSION); + System.IO.File.WriteAllText($"./output/Square.OkHttp3.LoggingInterceptor.{NUGET_VERSION}.nupkg.baseversion", NUGET_OLD_VERSION); }); Task("samples") diff --git a/Android/SquareOkHttp3-v3/cgmanifest.json b/Android/SquareOkHttp3-v3/cgmanifest.json index f771ef3ce2..0c9ec78798 100644 --- a/Android/SquareOkHttp3-v3/cgmanifest.json +++ b/Android/SquareOkHttp3-v3/cgmanifest.json @@ -10,6 +10,39 @@ "NuGetId": "Square.OkHttp3" } } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "okhttp-urlconnection", + "GroupId": "com.squareup.okhttp3", + "Version": "3.14.9", + "NuGetId": "Square.OkHttp3.UrlConnection" + } + } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "logging-interceptor", + "GroupId": "com.squareup.okhttp3", + "Version": "3.14.9", + "NuGetId": "Square.OkHttp3.LoggingInterceptor" + } + } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "okhttp-ws", + "GroupId": "com.squareup.okhttp3", + "Version": "3.4.2", + "NuGetId": "Square.OkHttp3.WS" + } + } } ], "Version": 1 diff --git a/Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor.svg b/Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor.svg similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor.svg rename to Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor.svg diff --git a/Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_1024x1024.png b/Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_1024x1024.png similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_1024x1024.png rename to Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_1024x1024.png diff --git a/Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_128x128.png b/Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_128x128.png similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_128x128.png rename to Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_128x128.png diff --git a/Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_256x256.png b/Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_256x256.png similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_256x256.png rename to Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_256x256.png diff --git a/Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_512x512.png b/Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_512x512.png similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/icons/square.okhttp.logginginterceptor_512x512.png rename to Android/SquareOkHttp3-v3/icons/square.okhttp.logginginterceptor_512x512.png diff --git a/Android/SquareOkHttp3-v3/samples/OkHttp3Sample/OkHttp3Sample.csproj b/Android/SquareOkHttp3-v3/samples/OkHttp3Sample/OkHttp3Sample.csproj index 1b35dca101..bd77419ba5 100644 --- a/Android/SquareOkHttp3-v3/samples/OkHttp3Sample/OkHttp3Sample.csproj +++ b/Android/SquareOkHttp3-v3/samples/OkHttp3Sample/OkHttp3Sample.csproj @@ -13,7 +13,7 @@ true Resources\Resource.Designer.cs Off - v9.0 + v10.0 Properties\AndroidManifest.xml armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj similarity index 83% rename from Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj index 3bcf75116d..33b632df68 100644 --- a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj +++ b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj @@ -1,6 +1,6 @@  - monoandroid9.0 + monoandroid10.0 true Square.OkHttp3.LoggingInterceptor Square.OkHttp3.LoggingInterceptor @@ -23,22 +23,20 @@ LICENSE.md true okhttp square square.okhttp xamarin android monodroid logging - 4.4.1 + 3.14.9.1 - - - - - - + + + + \ No newline at end of file diff --git a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumFields.xml similarity index 100% rename from Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumFields.xml diff --git a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumMethods.xml similarity index 100% rename from Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumMethods.xml diff --git a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml similarity index 100% rename from Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml diff --git a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj similarity index 80% rename from Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj index e2d36089d4..c4c7a8a389 100644 --- a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj +++ b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj @@ -1,6 +1,6 @@ - + - monoandroid9.0 + monoandroid10.0 true Square.OkHttp3.UrlConnection Square.OkHttp3.UrlConnection @@ -23,22 +23,20 @@ LICENSE.md true okhttp square square.okhttp xamarin android monodroid - 3.14.9 + 3.14.9.1 - - - - - + - - + + + + \ No newline at end of file diff --git a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml similarity index 100% rename from Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml diff --git a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml similarity index 100% rename from Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml diff --git a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml similarity index 100% rename from Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml rename to Android/SquareOkHttp3-v3/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml diff --git a/Android/SquareOkHttp3-v3/source/Square.OkHttp3.sln b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.sln index d2ae63e892..f70c932f46 100644 --- a/Android/SquareOkHttp3-v3/source/Square.OkHttp3.sln +++ b/Android/SquareOkHttp3-v3/source/Square.OkHttp3.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 16.0.30413.136 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Square.OkHttp3", "Square.OkHttp3\Square.OkHttp3.csproj", "{EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.LoggingInterceptor", "Square.OkHttp3.LoggingInterceptor\Square.OkHttp3.LoggingInterceptor.csproj", "{BFB6553A-93BB-41CC-B168-69DD9D192B8B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.UrlConnection", "Square.OkHttp3.UrlConnection\Square.OkHttp3.UrlConnection.csproj", "{662FE1FE-B992-4E2C-9F18-6BAD482456E6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +19,14 @@ Global {EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}.Release|Any CPU.Build.0 = Release|Any CPU + {BFB6553A-93BB-41CC-B168-69DD9D192B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFB6553A-93BB-41CC-B168-69DD9D192B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFB6553A-93BB-41CC-B168-69DD9D192B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFB6553A-93BB-41CC-B168-69DD9D192B8B}.Release|Any CPU.Build.0 = Release|Any CPU + {662FE1FE-B992-4E2C-9F18-6BAD482456E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {662FE1FE-B992-4E2C-9F18-6BAD482456E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {662FE1FE-B992-4E2C-9F18-6BAD482456E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {662FE1FE-B992-4E2C-9F18-6BAD482456E6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Android/SquareOkHttp3-v3/source/Square.OkHttp3/Square.OkHttp3.csproj b/Android/SquareOkHttp3-v3/source/Square.OkHttp3/Square.OkHttp3.csproj index 18568cf674..d5bafe23a9 100644 --- a/Android/SquareOkHttp3-v3/source/Square.OkHttp3/Square.OkHttp3.csproj +++ b/Android/SquareOkHttp3-v3/source/Square.OkHttp3/Square.OkHttp3.csproj @@ -1,10 +1,9 @@ - + - monoandroid9.0 + monoandroid10.0 True Square.OkHttp3 Square.OkHttp3 - 3.0.0.0 False True class-parse @@ -24,14 +23,13 @@ LICENSE.md true okhttp square square.okhttp xamarin android monodroid - 3.14.9 + 3.14.9.1 - - + diff --git a/Android/SquareOkHttp3/build.cake b/Android/SquareOkHttp3/build.cake index bf5e5458b7..a80a87523a 100644 --- a/Android/SquareOkHttp3/build.cake +++ b/Android/SquareOkHttp3/build.cake @@ -1,18 +1,25 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var NUGET_VERSION = "4.9.1"; +var NUGET_VERSION = "4.9.1.1"; + var JAR_VERSION = "4.9.1"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar"; +var JAR_OKHTTP_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar"; +var JAR_OKHTTP_URLCONNECTION_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/{JAR_VERSION}/okhttp-urlconnection-{JAR_VERSION}.jar"; +var JAR_OKHTTP_LOGGING_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor/{JAR_VERSION}/logging-interceptor-{JAR_VERSION}.jar"; Task ("externals") .Does (() => { EnsureDirectoryExists ("./externals"); - DownloadFile(JAR_URL, "./externals/okhttp3.jar"); + DownloadFile(JAR_OKHTTP_URL, "./externals/okhttp3.jar"); + DownloadFile(JAR_OKHTTP_URLCONNECTION_URL, "./externals/okhttp3-urlconnection.jar"); + DownloadFile(JAR_OKHTTP_LOGGING_URL, "./externals/okhttp3-logging-interceptor.jar"); // Update .csproj nuget versions XmlPoke("./source/Square.OkHttp3/Square.OkHttp3.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); + XmlPoke("./source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); + XmlPoke("./source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); }); Task("nuget") diff --git a/Android/SquareOkHttp3/cgmanifest.json b/Android/SquareOkHttp3/cgmanifest.json index 3ec8436934..600496acd5 100644 --- a/Android/SquareOkHttp3/cgmanifest.json +++ b/Android/SquareOkHttp3/cgmanifest.json @@ -10,6 +10,28 @@ "NuGetId": "Square.OkHttp3" } } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "okhttp-urlconnection", + "GroupId": "com.squareup.okhttp3", + "Version": "4.9.1", + "NuGetId": "Square.OkHttp3.UrlConnection" + } + } + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "logging-interceptor", + "GroupId": "com.squareup.okhttp3", + "Version": "4.9.1", + "NuGetId": "Square.OkHttp3.LoggingInterceptor" + } + } } ], "Version": 1 diff --git a/Android/SquareOkHttpWS/icons/square.okhttp.ws.svg b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor.svg similarity index 94% rename from Android/SquareOkHttpWS/icons/square.okhttp.ws.svg rename to Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor.svg index 16a7b40444..e2d459b285 100644 --- a/Android/SquareOkHttpWS/icons/square.okhttp.ws.svg +++ b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor.svg @@ -15,8 +15,8 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="square.okhttp.ws.svg" - inkscape:export-filename="C:\Projects\square.picasso-binding\icons\square.okhttp.ws_256x256.png" + sodipodi:docname="square.okhttp.logginginterceptor.svg" + inkscape:export-filename="C:\Projects\square.picasso-binding\icons\square.okhttp.logginginterceptor_256x256.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5"> OkHttp WS + style="font-size:96px">LoggingInterceptor diff --git a/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_1024x1024.png b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_1024x1024.png new file mode 100644 index 0000000000..7edb776dab Binary files /dev/null and b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_1024x1024.png differ diff --git a/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_128x128.png b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_128x128.png new file mode 100644 index 0000000000..68b30b4d4e Binary files /dev/null and b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_128x128.png differ diff --git a/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_256x256.png b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_256x256.png new file mode 100644 index 0000000000..d1bd837664 Binary files /dev/null and b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_256x256.png differ diff --git a/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_512x512.png b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_512x512.png new file mode 100644 index 0000000000..973a267dee Binary files /dev/null and b/Android/SquareOkHttp3/icons/square.okhttp.logginginterceptor_512x512.png differ diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj b/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj new file mode 100644 index 0000000000..4ef9a207e4 --- /dev/null +++ b/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj @@ -0,0 +1,42 @@ + + + monoandroid10.0 + true + Square.OkHttp3.LoggingInterceptor + Square.OkHttp3.LoggingInterceptor + False + True + class-parse + XAJavaInterop1 + + + + Square.OkHttp3.LoggingInterceptor + OkHttp v3 LoggingInterceptor bindings for Xamarin.Android + OkHttp ability to be used with LoggingInterceptor. + OkHttp ability to be used with LoggingInterceptor. + Microsoft + Microsoft + © Microsoft Corporation. All rights reserved. + https://go.microsoft.com/fwlink/?linkid=2130312 + square.okhttp.logginginterceptor_256x256.png + LICENSE.md + true + okhttp square square.okhttp xamarin android monodroid logging + 4.9.1.1 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Transforms/EnumFields.xml b/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumFields.xml similarity index 100% rename from Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Transforms/EnumFields.xml rename to Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumFields.xml diff --git a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Transforms/EnumMethods.xml b/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumMethods.xml similarity index 100% rename from Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection/Transforms/EnumMethods.xml rename to Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/EnumMethods.xml diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml b/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml new file mode 100644 index 0000000000..ad58ac1dc4 --- /dev/null +++ b/Android/SquareOkHttp3/source/Square.OkHttp3.LoggingInterceptor/Transforms/Metadata.xml @@ -0,0 +1,17 @@ + + + + Square.OkHttp3.Logging + + + + + + + diff --git a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj similarity index 83% rename from Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj rename to Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj index 19903f8a1c..1ae052da44 100644 --- a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj +++ b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj @@ -1,4 +1,4 @@ - + monoandroid10.0 true @@ -23,22 +23,20 @@ LICENSE.md true okhttp square square.okhttp xamarin android monodroid - 4.9.1 + 4.9.1.1 - - - - - - + + + + \ No newline at end of file diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml new file mode 100644 index 0000000000..e9af0eeb3d --- /dev/null +++ b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/EnumFields.xml @@ -0,0 +1,18 @@ + + + diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml new file mode 100644 index 0000000000..2efa814671 --- /dev/null +++ b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/EnumMethods.xml @@ -0,0 +1,18 @@ + + + diff --git a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml b/Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml similarity index 100% rename from Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml rename to Android/SquareOkHttp3/source/Square.OkHttp3.UrlConnection/Transforms/Metadata.xml diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3.sln b/Android/SquareOkHttp3/source/Square.OkHttp3.sln index d2ae63e892..aec4fd18a9 100644 --- a/Android/SquareOkHttp3/source/Square.OkHttp3.sln +++ b/Android/SquareOkHttp3/source/Square.OkHttp3.sln @@ -3,7 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30413.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Square.OkHttp3", "Square.OkHttp3\Square.OkHttp3.csproj", "{EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3", "Square.OkHttp3\Square.OkHttp3.csproj", "{EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.UrlConnection", "Square.OkHttp3.UrlConnection\Square.OkHttp3.UrlConnection.csproj", "{B1A0F864-CA00-4647-9EDA-A00BD96A82FF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.LoggingInterceptor", "Square.OkHttp3.LoggingInterceptor\Square.OkHttp3.LoggingInterceptor.csproj", "{CEF287F0-C25B-487D-9A37-23A283B46F1F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +19,14 @@ Global {EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE5B87EC-8734-4B04-890E-83F6E2ECE0CC}.Release|Any CPU.Build.0 = Release|Any CPU + {B1A0F864-CA00-4647-9EDA-A00BD96A82FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1A0F864-CA00-4647-9EDA-A00BD96A82FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1A0F864-CA00-4647-9EDA-A00BD96A82FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1A0F864-CA00-4647-9EDA-A00BD96A82FF}.Release|Any CPU.Build.0 = Release|Any CPU + {CEF287F0-C25B-487D-9A37-23A283B46F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CEF287F0-C25B-487D-9A37-23A283B46F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CEF287F0-C25B-487D-9A37-23A283B46F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CEF287F0-C25B-487D-9A37-23A283B46F1F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj b/Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj index a155e5a8ba..8e67fe85f6 100644 --- a/Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj +++ b/Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj @@ -1,6 +1,6 @@ - + - monoandroid9.0 + monoandroid10.0 True Square.OkHttp3 Square.OkHttp3 @@ -23,14 +23,13 @@ LICENSE.md true okhttp square square.okhttp xamarin android monodroid - 4.9.1 + 4.9.1.1 - - + diff --git a/Android/SquareOkHttp3LoggingInterceptor/External-Dependency-Info.txt b/Android/SquareOkHttp3LoggingInterceptor/External-Dependency-Info.txt deleted file mode 100644 index fefb62475e..0000000000 --- a/Android/SquareOkHttp3LoggingInterceptor/External-Dependency-Info.txt +++ /dev/null @@ -1,216 +0,0 @@ -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -Do not translate or localize - -Xamarin Components for Square OkHttp LoggingInterceptor -third party material from the projects listed below. The original copyright -notice and the license under which Microsoft received such third party -material are set forth below. Microsoft reserves all other rights not -expressly granted, whether by implication, estoppel or otherwise. - -######################################## -# Square OkHttp LoggingInterceptor -# https://github.com/square/okhttp -######################################## - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/Android/SquareOkHttp3LoggingInterceptor/License.md b/Android/SquareOkHttp3LoggingInterceptor/License.md deleted file mode 100644 index 8947ee6f9d..0000000000 --- a/Android/SquareOkHttp3LoggingInterceptor/License.md +++ /dev/null @@ -1,17 +0,0 @@ -**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.** - -Note: This component depends on [Square OkHttp LoggingInterceptor](https://github.com/square/okhttp), which is subject to the [Apache 2.0](https://github.com/square/okhttp/blob/master/LICENSE.txt) - -### Xamarin Component for Square OkHttp LoggingInterceptor for Xamarin.Android - -**The MIT License (MIT)** - -Copyright (c) .NET Foundation Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -20201124 \ No newline at end of file diff --git a/Android/SquareOkHttp3LoggingInterceptor/build.cake b/Android/SquareOkHttp3LoggingInterceptor/build.cake deleted file mode 100644 index faad45bab7..0000000000 --- a/Android/SquareOkHttp3LoggingInterceptor/build.cake +++ /dev/null @@ -1,49 +0,0 @@ -var TARGET = Argument ("t", Argument ("target", "ci")); - -var NUGET_VERSION = "4.4.1"; - -var JAR_VERSION = "4.4.1"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor/{JAR_VERSION}/logging-interceptor-{JAR_VERSION}.jar"; - -Task ("externals") - .Does (() => -{ - EnsureDirectoryExists ("./externals"); - - DownloadFile(JAR_URL, "./externals/logging-interceptor.jar"); - - // Update .csproj nuget versions - XmlPoke("./source/Square.OkHttp3.LoggingInterceptor/Square.OkHttp3.LoggingInterceptor.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); -}); - -Task("nuget") - .IsDependentOn("externals") - .Does(() => -{ - MSBuild ("./source/Square.OkHttp3.LoggingInterceptor.sln", c => { - c.Configuration = "Release"; - c.Restore = true; - c.MaxCpuCount = 0; - c.Targets.Clear(); - c.Targets.Add("Pack"); - c.Properties.Add("PackageOutputPath", new [] { MakeAbsolute(new FilePath("./output")).FullPath }); - c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" }); - c.Properties.Add("DesignTimeBuild", new [] { "false" }); - }); -}); - -Task("ci") - .IsDependentOn("externals") - .IsDependentOn("nuget"); - -Task ("clean") - .Does (() => -{ - if (DirectoryExists ("./externals/")) - DeleteDirectory ("./externals", new DeleteDirectorySettings { - Recursive = true, - Force = true - }); -}); - -RunTarget (TARGET); diff --git a/Android/SquareOkHttp3LoggingInterceptor/cgmanifest.json b/Android/SquareOkHttp3LoggingInterceptor/cgmanifest.json deleted file mode 100644 index 1aab5c4784..0000000000 --- a/Android/SquareOkHttp3LoggingInterceptor/cgmanifest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Registrations": [ - { - "Component": { - "Type": "Maven", - "Maven": { - "ArtifactId": "logging-interceptor", - "GroupId": "com.squareup.okhttp3", - "Version": "4.4.1", - "NuGetId": "Square.OkHttp3.LoggingInterceptor" - } - } - } - ], - "Version": 1 -} diff --git a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor.sln b/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor.sln deleted file mode 100644 index e915c3dfe1..0000000000 --- a/Android/SquareOkHttp3LoggingInterceptor/source/Square.OkHttp3.LoggingInterceptor.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.LoggingInterceptor", "Square.OkHttp3.LoggingInterceptor\Square.OkHttp3.LoggingInterceptor.csproj", "{EA257654-4BA2-40C4-B078-EF0AD9CB4B86}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Android/SquareOkHttp3UrlConnection-v3/External-Dependency-Info.txt b/Android/SquareOkHttp3UrlConnection-v3/External-Dependency-Info.txt deleted file mode 100644 index 681d85f8f7..0000000000 --- a/Android/SquareOkHttp3UrlConnection-v3/External-Dependency-Info.txt +++ /dev/null @@ -1,216 +0,0 @@ -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -Do not translate or localize - -Xamarin Components for Square OkHttp URLConnection -third party material from the projects listed below. The original copyright -notice and the license under which Microsoft received such third party -material are set forth below. Microsoft reserves all other rights not -expressly granted, whether by implication, estoppel or otherwise. - -######################################## -# Square OkHttp URLConnection -# https://github.com/square/okhttp -######################################## - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/Android/SquareOkHttp3UrlConnection-v3/License.md b/Android/SquareOkHttp3UrlConnection-v3/License.md deleted file mode 100644 index 6f622a5b4f..0000000000 --- a/Android/SquareOkHttp3UrlConnection-v3/License.md +++ /dev/null @@ -1,17 +0,0 @@ -**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.** - -Note: This component depends on [Square OkHttp URLConnection](https://github.com/square/okhttp), which is subject to the [Apache 2.0](https://github.com/square/okhttp/blob/master/LICENSE.txt) - -### Xamarin Component for Square OkHttp URLConnection for Xamarin.Android - -**The MIT License (MIT)** - -Copyright (c) .NET Foundation Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -20190503 diff --git a/Android/SquareOkHttp3UrlConnection-v3/build.cake b/Android/SquareOkHttp3UrlConnection-v3/build.cake deleted file mode 100644 index 3daafbec45..0000000000 --- a/Android/SquareOkHttp3UrlConnection-v3/build.cake +++ /dev/null @@ -1,54 +0,0 @@ -var TARGET = Argument ("t", Argument ("target", "ci")); - -// this is used for the NuGet diff as v4 is a major changes -var NUGET_OLD_VERSION = "3.12.3"; - -var NUGET_VERSION = "3.14.9"; - -var JAR_VERSION = "3.14.9"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/{JAR_VERSION}/okhttp-urlconnection-{JAR_VERSION}.jar"; - -Task ("externals") - .Does (() => -{ - EnsureDirectoryExists ("./externals"); - - DownloadFile(JAR_URL, "./externals/okhttp3-urlconnection.jar"); - - // Update .csproj nuget versions - XmlPoke("./source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); -}); - -Task("nuget") - .IsDependentOn("externals") - .Does(() => -{ - MSBuild ("./source/Square.OkHttp3.UrlConnection.sln", c => { - c.Configuration = "Release"; - c.Restore = true; - c.MaxCpuCount = 0; - c.Targets.Clear(); - c.Targets.Add("Pack"); - c.Properties.Add("PackageOutputPath", new [] { MakeAbsolute(new FilePath("./output")).FullPath }); - c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" }); - c.Properties.Add("DesignTimeBuild", new [] { "false" }); - }); - - System.IO.File.WriteAllText($"./output/Square.OkHttp3.{NUGET_VERSION}.nupkg.baseversion", NUGET_OLD_VERSION); -}); - -Task("ci") - .IsDependentOn("externals") - .IsDependentOn("nuget"); - -Task ("clean") - .Does (() => -{ - if (DirectoryExists ("./externals/")) - DeleteDirectory ("./externals", new DeleteDirectorySettings { - Recursive = true, - Force = true - }); -}); - -RunTarget (TARGET); diff --git a/Android/SquareOkHttp3UrlConnection-v3/cgmanifest.json b/Android/SquareOkHttp3UrlConnection-v3/cgmanifest.json deleted file mode 100644 index 93b8779358..0000000000 --- a/Android/SquareOkHttp3UrlConnection-v3/cgmanifest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Registrations": [ - { - "Component": { - "Type": "Maven", - "Maven": { - "ArtifactId": "okhttp-urlconnection", - "GroupId": "com.squareup.okhttp3", - "Version": "3.14.9", - "NuGetId": "Square.OkHttp3.UrlConnection" - } - } - } - ], - "Version": 1 -} diff --git a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp.svg b/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp.svg deleted file mode 100644 index f66a1b0abc..0000000000 --- a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp.svg +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - OkHttp - - diff --git a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_1024x1024.png b/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_1024x1024.png deleted file mode 100644 index 7cfe3822f4..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_1024x1024.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_128x128.png b/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_128x128.png deleted file mode 100644 index 5447d49bed..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_128x128.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_256x256.png b/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_256x256.png deleted file mode 100644 index f7197a8fd3..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_256x256.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_512x512.png b/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_512x512.png deleted file mode 100644 index e0d3736dd5..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection-v3/icons/square.okhttp_512x512.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection.sln b/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection.sln deleted file mode 100644 index 29f677a4b6..0000000000 --- a/Android/SquareOkHttp3UrlConnection-v3/source/Square.OkHttp3.UrlConnection.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.UrlConnection", "Square.OkHttp3.UrlConnection\Square.OkHttp3.UrlConnection.csproj", "{EA257654-4BA2-40C4-B078-EF0AD9CB4B86}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Android/SquareOkHttp3UrlConnection/External-Dependency-Info.txt b/Android/SquareOkHttp3UrlConnection/External-Dependency-Info.txt deleted file mode 100644 index 681d85f8f7..0000000000 --- a/Android/SquareOkHttp3UrlConnection/External-Dependency-Info.txt +++ /dev/null @@ -1,216 +0,0 @@ -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -Do not translate or localize - -Xamarin Components for Square OkHttp URLConnection -third party material from the projects listed below. The original copyright -notice and the license under which Microsoft received such third party -material are set forth below. Microsoft reserves all other rights not -expressly granted, whether by implication, estoppel or otherwise. - -######################################## -# Square OkHttp URLConnection -# https://github.com/square/okhttp -######################################## - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/Android/SquareOkHttp3UrlConnection/License.md b/Android/SquareOkHttp3UrlConnection/License.md deleted file mode 100644 index c7649aa3b4..0000000000 --- a/Android/SquareOkHttp3UrlConnection/License.md +++ /dev/null @@ -1,17 +0,0 @@ -**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.** - -Note: This component depends on [Square OkHttp URLConnection](https://github.com/square/okhttp), which is subject to the [Apache 2.0](https://github.com/square/okhttp/blob/master/LICENSE.txt) - -### Xamarin Component for Square OkHttp URLConnection for Xamarin.Android - -**The MIT License (MIT)** - -Copyright (c) .NET Foundation Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -20201124 \ No newline at end of file diff --git a/Android/SquareOkHttp3UrlConnection/build.cake b/Android/SquareOkHttp3UrlConnection/build.cake deleted file mode 100644 index 9ff1a08d59..0000000000 --- a/Android/SquareOkHttp3UrlConnection/build.cake +++ /dev/null @@ -1,49 +0,0 @@ -var TARGET = Argument ("t", Argument ("target", "ci")); - -var NUGET_VERSION = "4.9.1"; - -var JAR_VERSION = "4.9.1"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/{JAR_VERSION}/okhttp-urlconnection-{JAR_VERSION}.jar"; - -Task ("externals") - .Does (() => -{ - EnsureDirectoryExists ("./externals"); - - DownloadFile(JAR_URL, "./externals/okhttp3-urlconnection.jar"); - - // Update .csproj nuget versions - XmlPoke("./source/Square.OkHttp3.UrlConnection/Square.OkHttp3.UrlConnection.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); -}); - -Task("nuget") - .IsDependentOn("externals") - .Does(() => -{ - MSBuild ("./source/Square.OkHttp3.UrlConnection.sln", c => { - c.Configuration = "Release"; - c.Restore = true; - c.MaxCpuCount = 0; - c.Targets.Clear(); - c.Targets.Add("Pack"); - c.Properties.Add("PackageOutputPath", new [] { MakeAbsolute(new FilePath("./output")).FullPath }); - c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" }); - c.Properties.Add("DesignTimeBuild", new [] { "false" }); - }); -}); - -Task("ci") - .IsDependentOn("externals") - .IsDependentOn("nuget"); - -Task ("clean") - .Does (() => -{ - if (DirectoryExists ("./externals/")) - DeleteDirectory ("./externals", new DeleteDirectorySettings { - Recursive = true, - Force = true - }); -}); - -RunTarget (TARGET); diff --git a/Android/SquareOkHttp3UrlConnection/cgmanifest.json b/Android/SquareOkHttp3UrlConnection/cgmanifest.json deleted file mode 100644 index a65dfbf3c0..0000000000 --- a/Android/SquareOkHttp3UrlConnection/cgmanifest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Registrations": [ - { - "Component": { - "Type": "Maven", - "Maven": { - "ArtifactId": "okhttp-urlconnection", - "GroupId": "com.squareup.okhttp3", - "Version": "4.9.1", - "NuGetId": "Square.OkHttp3.UrlConnection" - } - } - } - ], - "Version": 1 -} diff --git a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp.svg b/Android/SquareOkHttp3UrlConnection/icons/square.okhttp.svg deleted file mode 100644 index f66a1b0abc..0000000000 --- a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp.svg +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - OkHttp - - diff --git a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_1024x1024.png b/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_1024x1024.png deleted file mode 100644 index 7cfe3822f4..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_1024x1024.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_128x128.png b/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_128x128.png deleted file mode 100644 index 5447d49bed..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_128x128.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_256x256.png b/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_256x256.png deleted file mode 100644 index f7197a8fd3..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_256x256.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_512x512.png b/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_512x512.png deleted file mode 100644 index e0d3736dd5..0000000000 Binary files a/Android/SquareOkHttp3UrlConnection/icons/square.okhttp_512x512.png and /dev/null differ diff --git a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection.sln b/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection.sln deleted file mode 100644 index 29f677a4b6..0000000000 --- a/Android/SquareOkHttp3UrlConnection/source/Square.OkHttp3.UrlConnection.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp3.UrlConnection", "Square.OkHttp3.UrlConnection\Square.OkHttp3.UrlConnection.csproj", "{EA257654-4BA2-40C4-B078-EF0AD9CB4B86}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA257654-4BA2-40C4-B078-EF0AD9CB4B86}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Android/SquareOkHttpUrlConnection/External-Dependency-Info.txt b/Android/SquareOkHttpUrlConnection/External-Dependency-Info.txt deleted file mode 100644 index 681d85f8f7..0000000000 --- a/Android/SquareOkHttpUrlConnection/External-Dependency-Info.txt +++ /dev/null @@ -1,216 +0,0 @@ -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -Do not translate or localize - -Xamarin Components for Square OkHttp URLConnection -third party material from the projects listed below. The original copyright -notice and the license under which Microsoft received such third party -material are set forth below. Microsoft reserves all other rights not -expressly granted, whether by implication, estoppel or otherwise. - -######################################## -# Square OkHttp URLConnection -# https://github.com/square/okhttp -######################################## - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/Android/SquareOkHttpUrlConnection/License.md b/Android/SquareOkHttpUrlConnection/License.md deleted file mode 100644 index 6f622a5b4f..0000000000 --- a/Android/SquareOkHttpUrlConnection/License.md +++ /dev/null @@ -1,17 +0,0 @@ -**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.** - -Note: This component depends on [Square OkHttp URLConnection](https://github.com/square/okhttp), which is subject to the [Apache 2.0](https://github.com/square/okhttp/blob/master/LICENSE.txt) - -### Xamarin Component for Square OkHttp URLConnection for Xamarin.Android - -**The MIT License (MIT)** - -Copyright (c) .NET Foundation Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -20190503 diff --git a/Android/SquareOkHttpUrlConnection/build.cake b/Android/SquareOkHttpUrlConnection/build.cake deleted file mode 100644 index 9d6283ef51..0000000000 --- a/Android/SquareOkHttpUrlConnection/build.cake +++ /dev/null @@ -1,49 +0,0 @@ -var TARGET = Argument ("t", Argument ("target", "ci")); - -var NUGET_VERSION = "2.7.5.1"; - -var JAR_VERSION = "2.7.5"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp/okhttp-urlconnection/{JAR_VERSION}/okhttp-urlconnection-{JAR_VERSION}.jar"; - -Task ("externals") - .Does (() => -{ - EnsureDirectoryExists ("./externals"); - - DownloadFile(JAR_URL, "./externals/okhttp-urlconnection.jar"); - - // Update .csproj nuget versions - XmlPoke("./source/Square.OkHttp.UrlConnection/Square.OkHttp.UrlConnection.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); -}); - -Task("nuget") - .IsDependentOn("externals") - .Does(() => -{ - MSBuild ("./source/Square.OkHttp.UrlConnection.sln", c => { - c.Configuration = "Release"; - c.Restore = true; - c.MaxCpuCount = 0; - c.Targets.Clear(); - c.Targets.Add("Pack"); - c.Properties.Add("PackageOutputPath", new [] { MakeAbsolute(new FilePath("./output")).FullPath }); - c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" }); - c.Properties.Add("DesignTimeBuild", new [] { "false" }); - }); -}); - -Task("ci") - .IsDependentOn("externals") - .IsDependentOn("nuget"); - -Task ("clean") - .Does (() => -{ - if (DirectoryExists ("./externals/")) - DeleteDirectory ("./externals", new DeleteDirectorySettings { - Recursive = true, - Force = true - }); -}); - -RunTarget (TARGET); diff --git a/Android/SquareOkHttpUrlConnection/cgmanifest.json b/Android/SquareOkHttpUrlConnection/cgmanifest.json deleted file mode 100644 index ec7be9136e..0000000000 --- a/Android/SquareOkHttpUrlConnection/cgmanifest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Registrations": [ - { - "Component": { - "Type": "Maven", - "Maven": { - "ArtifactId": "okhttp-urlconnection", - "GroupId": "com.squareup.okhttp", - "Version": "2.7.5", - "NuGetId": "Square.OkHttp.UrlConnection" - } - } - } - ], - "Version": 1 -} diff --git a/Android/SquareOkHttpUrlConnection/icons/square.okhttp.svg b/Android/SquareOkHttpUrlConnection/icons/square.okhttp.svg deleted file mode 100644 index f66a1b0abc..0000000000 --- a/Android/SquareOkHttpUrlConnection/icons/square.okhttp.svg +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - OkHttp - - diff --git a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_1024x1024.png b/Android/SquareOkHttpUrlConnection/icons/square.okhttp_1024x1024.png deleted file mode 100644 index 7cfe3822f4..0000000000 Binary files a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_1024x1024.png and /dev/null differ diff --git a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_128x128.png b/Android/SquareOkHttpUrlConnection/icons/square.okhttp_128x128.png deleted file mode 100644 index 5447d49bed..0000000000 Binary files a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_128x128.png and /dev/null differ diff --git a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_256x256.png b/Android/SquareOkHttpUrlConnection/icons/square.okhttp_256x256.png deleted file mode 100644 index f7197a8fd3..0000000000 Binary files a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_256x256.png and /dev/null differ diff --git a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_512x512.png b/Android/SquareOkHttpUrlConnection/icons/square.okhttp_512x512.png deleted file mode 100644 index e0d3736dd5..0000000000 Binary files a/Android/SquareOkHttpUrlConnection/icons/square.okhttp_512x512.png and /dev/null differ diff --git a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection.sln b/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection.sln deleted file mode 100644 index 50a84b5ff5..0000000000 --- a/Android/SquareOkHttpUrlConnection/source/Square.OkHttp.UrlConnection.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp.UrlConnection", "Square.OkHttp.UrlConnection\Square.OkHttp.UrlConnection.csproj", "{5CA2C1AC-6F11-4597-BA23-78F8E1DD5735}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5CA2C1AC-6F11-4597-BA23-78F8E1DD5735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CA2C1AC-6F11-4597-BA23-78F8E1DD5735}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CA2C1AC-6F11-4597-BA23-78F8E1DD5735}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CA2C1AC-6F11-4597-BA23-78F8E1DD5735}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Android/SquareOkHttpWS/Details.md b/Android/SquareOkHttpWS/Details.md deleted file mode 100644 index a86489812a..0000000000 --- a/Android/SquareOkHttpWS/Details.md +++ /dev/null @@ -1,80 +0,0 @@ -# OkHttp Web Sockets Details - -> A **RFC6455**-compliant web socket implementation - -## Connecting - -We can connect to a web socket using the `WebSocketCall` type with the usual `OkHttpClient` and `Request` types of OkHttp: - - OkHttpClient client = new OkHttpClient(); - - // Create request for remote resource. - Request request = new Request.Builder() - .Url(Endpoint) - .Build(); - - // Execute the request and retrieve the response. - WebSocketCall call = WebSocketCall.Create(client, request); - -## Listening - -We can use an event-based listener: - - WebSocketListener listener = call.Enqueue(); - listener.Open += (sender, e) => { - // the socket was opened, so get the socket - var socket = e.WebSocket; - }; - -Or, we can implement the listener: - - // connect and receive - call.Enqueue(new SocketListener()); - - // the listener type - class SocketListener : Java.Lang.Object, IWebSocketListener - { - public void OnClose(int code, string reason) - { - // the connection was closed - } - public void OnFailure(Java.IO.IOException exception, Response response) - { - // there was an error - } - public void OnMessage(IBufferedSource source, WebSocketPayloadType payloadType) - { - // we received a message - } - public void OnOpen(IWebSocket socket, Response response) - { - // the socket was opened - } - public void OnPong(OkBuffer buffer) - { - // respond to a ping - } - } - -## Communicating - -Using either the event-based listener or a custom implementation, we can access the open socket and start sending messages: - - public void OnOpen(IWebSocket socket, Response response) - { - var buffer = new OkBuffer(); - buffer.WriteString("Hello World!", Charset.DefaultCharset()); - socket.SendMessage(WebSocketPayloadType.Text, buffer); - }; - -When a message comes in from a remote source, we can handle it using either the event-based listener or a custom implementation: - - listener.Message += (sender, e) => { - // read the contents - string payload = e.Payload.ReadString(Charset.DefaultCharset()); - - // close the message - e.Payload.Close(); - }; - -*Note: This module's API should be considered experimental and may be subject to breaking changes in future releases.* diff --git a/Android/SquareOkHttpWS/External-Dependency-Info.txt b/Android/SquareOkHttpWS/External-Dependency-Info.txt deleted file mode 100644 index fea1d66e30..0000000000 --- a/Android/SquareOkHttpWS/External-Dependency-Info.txt +++ /dev/null @@ -1,216 +0,0 @@ -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -Do not translate or localize - -Xamarin Components for Square OkHttp Web Sockets -third party material from the projects listed below. The original copyright -notice and the license under which Microsoft received such third party -material are set forth below. Microsoft reserves all other rights not -expressly granted, whether by implication, estoppel or otherwise. - -######################################## -# Square OkHttp Web Sockets -# https://github.com/square/okhttp -######################################## - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/Android/SquareOkHttpWS/GettingStarted.md b/Android/SquareOkHttpWS/GettingStarted.md deleted file mode 100644 index 426c8f3ba5..0000000000 --- a/Android/SquareOkHttpWS/GettingStarted.md +++ /dev/null @@ -1,80 +0,0 @@ -# Getting Started with OkHttp Web Sockets - -> A **RFC6455**-compliant web socket implementation - -## Connecting - -We can connect to a web socket using the `WebSocketCall` type with the usual `OkHttpClient` and `Request` types of OkHttp: - - OkHttpClient client = new OkHttpClient(); - - // Create request for remote resource. - Request request = new Request.Builder() - .Url(Endpoint) - .Build(); - - // Execute the request and retrieve the response. - WebSocketCall call = WebSocketCall.Create(client, request); - -## Listening - -We can use an event-based listener: - - WebSocketListener listener = call.Enqueue(); - listener.Open += (sender, e) => { - // the socket was opened, so get the socket - var socket = e.WebSocket; - }; - -Or, we can implement the listener: - - // connect and receive - call.Enqueue(new SocketListener()); - - // the listener type - class SocketListener : Java.Lang.Object, IWebSocketListener - { - public void OnClose(int code, string reason) - { - // the connection was closed - } - public void OnFailure(Java.IO.IOException exception, Response response) - { - // there was an error - } - public void OnMessage(IBufferedSource source, WebSocketPayloadType payloadType) - { - // we received a message - } - public void OnOpen(IWebSocket socket, Response response) - { - // the socket was opened - } - public void OnPong(OkBuffer buffer) - { - // respond to a ping - } - } - -## Communicating - -Using either the event-based listener or a custom implementation, we can access the open socket and start sending messages: - - public void OnOpen(IWebSocket socket, Response response) - { - var buffer = new OkBuffer(); - buffer.WriteString("Hello World!", Charset.DefaultCharset()); - socket.SendMessage(WebSocketPayloadType.Text, buffer); - }; - -When a message comes in from a remote source, we can handle it using either the event-based listener or a custom implementation: - - listener.Message += (sender, e) => { - // read the contents - string payload = e.Payload.ReadString(Charset.DefaultCharset()); - - // close the message - e.Payload.Close(); - }; - -*Note: This module's API should be considered experimental and may be subject to breaking changes in future releases.* diff --git a/Android/SquareOkHttpWS/License.md b/Android/SquareOkHttpWS/License.md deleted file mode 100644 index 4da7fb905c..0000000000 --- a/Android/SquareOkHttpWS/License.md +++ /dev/null @@ -1,17 +0,0 @@ -**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.** - -Note: This component depends on [Square OkHttp Web Sockets](https://github.com/square/okhttp), which is subject to the [Apache 2.0](https://github.com/square/okhttp/blob/master/LICENSE.txt) - -### Xamarin Component for Square OkHttp Web Sockets for Xamarin.Android - -**The MIT License (MIT)** - -Copyright (c) .NET Foundation Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -20190503 diff --git a/Android/SquareOkHttpWS/build.cake b/Android/SquareOkHttpWS/build.cake deleted file mode 100644 index 079a848478..0000000000 --- a/Android/SquareOkHttpWS/build.cake +++ /dev/null @@ -1,62 +0,0 @@ -var TARGET = Argument ("t", Argument ("target", "ci")); - -var NUGET_VERSION = "2.7.5.1"; - -var JAR_VERSION = "2.7.5"; -var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp/okhttp-ws/{JAR_VERSION}/okhttp-ws-{JAR_VERSION}.jar"; - -Task ("externals") - .Does (() => -{ - EnsureDirectoryExists ("./externals"); - - DownloadFile(JAR_URL, "./externals/okhttp-ws.jar"); - - // Update .csproj nuget versions - XmlPoke("./source/Square.OkHttp.WS/Square.OkHttp.WS.csproj", "/Project/PropertyGroup/PackageVersion", NUGET_VERSION); -}); - -Task("nuget") - .IsDependentOn("externals") - .Does(() => -{ - MSBuild ("./source/Square.OkHttp.WS.sln", c => { - c.Configuration = "Release"; - c.Restore = true; - c.MaxCpuCount = 0; - c.Targets.Clear(); - c.Targets.Add("Pack"); - c.Properties.Add("PackageOutputPath", new [] { MakeAbsolute(new FilePath("./output")).FullPath }); - c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" }); - c.Properties.Add("DesignTimeBuild", new [] { "false" }); - }); -}); - -Task("samples") - .IsDependentOn("nuget") - .Does(() => -{ - MSBuild ("./samples/OkHttpWSSample.sln", c => { - c.Configuration = "Release"; - c.Restore = true; - c.MaxCpuCount = 0; - c.Properties.Add("DesignTimeBuild", new [] { "false" }); - }); -}); - -Task("ci") - .IsDependentOn("externals") - .IsDependentOn("nuget") - .IsDependentOn("samples"); - -Task ("clean") - .Does (() => -{ - if (DirectoryExists ("./externals/")) - DeleteDirectory ("./externals", new DeleteDirectorySettings { - Recursive = true, - Force = true - }); -}); - -RunTarget (TARGET); diff --git a/Android/SquareOkHttpWS/cgmanifest.json b/Android/SquareOkHttpWS/cgmanifest.json deleted file mode 100644 index 93d323a564..0000000000 --- a/Android/SquareOkHttpWS/cgmanifest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Registrations": [ - { - "Component": { - "Type": "Maven", - "Maven": { - "ArtifactId": "okhttp-ws", - "GroupId": "com.squareup.okhttp", - "Version": "2.7.5", - "NuGetId": "Square.OkHttp.WS" - } - } - } - ], - "Version": 1 -} diff --git a/Android/SquareOkHttpWS/icons/square.okhttp.ws_1024x1024.png b/Android/SquareOkHttpWS/icons/square.okhttp.ws_1024x1024.png deleted file mode 100644 index 6b581d826f..0000000000 Binary files a/Android/SquareOkHttpWS/icons/square.okhttp.ws_1024x1024.png and /dev/null differ diff --git a/Android/SquareOkHttpWS/icons/square.okhttp.ws_128x128.png b/Android/SquareOkHttpWS/icons/square.okhttp.ws_128x128.png deleted file mode 100644 index aecc9c67ba..0000000000 Binary files a/Android/SquareOkHttpWS/icons/square.okhttp.ws_128x128.png and /dev/null differ diff --git a/Android/SquareOkHttpWS/icons/square.okhttp.ws_256x256.png b/Android/SquareOkHttpWS/icons/square.okhttp.ws_256x256.png deleted file mode 100644 index 5e11e11291..0000000000 Binary files a/Android/SquareOkHttpWS/icons/square.okhttp.ws_256x256.png and /dev/null differ diff --git a/Android/SquareOkHttpWS/icons/square.okhttp.ws_512x512.png b/Android/SquareOkHttpWS/icons/square.okhttp.ws_512x512.png deleted file mode 100644 index 5a975eedc2..0000000000 Binary files a/Android/SquareOkHttpWS/icons/square.okhttp.ws_512x512.png and /dev/null differ diff --git a/Android/SquareOkHttpWS/samples/OkHttpWSSample.sln b/Android/SquareOkHttpWS/samples/OkHttpWSSample.sln deleted file mode 100644 index c0edca0fc7..0000000000 --- a/Android/SquareOkHttpWS/samples/OkHttpWSSample.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OkHttpWSSample", "OkHttpWSSample\OkHttpWSSample.csproj", "{2B32C15A-4014-45DC-B5F5-55EBBE26C613}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp.WS", "..\source\Square.OkHttp.WS\Square.OkHttp.WS.csproj", "{15F960CA-7894-42F1-A7D1-53E46935D39B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2B32C15A-4014-45DC-B5F5-55EBBE26C613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B32C15A-4014-45DC-B5F5-55EBBE26C613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B32C15A-4014-45DC-B5F5-55EBBE26C613}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {2B32C15A-4014-45DC-B5F5-55EBBE26C613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B32C15A-4014-45DC-B5F5-55EBBE26C613}.Release|Any CPU.Build.0 = Release|Any CPU - {2B32C15A-4014-45DC-B5F5-55EBBE26C613}.Release|Any CPU.Deploy.0 = Release|Any CPU - {3877E12A-004D-47B8-A978-D58ADFDB5B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3877E12A-004D-47B8-A978-D58ADFDB5B60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3877E12A-004D-47B8-A978-D58ADFDB5B60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3877E12A-004D-47B8-A978-D58ADFDB5B60}.Release|Any CPU.Build.0 = Release|Any CPU - {15F960CA-7894-42F1-A7D1-53E46935D39B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15F960CA-7894-42F1-A7D1-53E46935D39B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15F960CA-7894-42F1-A7D1-53E46935D39B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15F960CA-7894-42F1-A7D1-53E46935D39B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Android/SquareOkHttpWS/source/Square.OkHttp.WS.sln b/Android/SquareOkHttpWS/source/Square.OkHttp.WS.sln deleted file mode 100644 index 79e09ec21f..0000000000 --- a/Android/SquareOkHttpWS/source/Square.OkHttp.WS.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.OkHttp.WS", "Square.OkHttp.WS\Square.OkHttp.WS.csproj", "{A0D51C46-AFEB-4E40-8E74-DF4F1FC140BB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A0D51C46-AFEB-4E40-8E74-DF4F1FC140BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0D51C46-AFEB-4E40-8E74-DF4F1FC140BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0D51C46-AFEB-4E40-8E74-DF4F1FC140BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0D51C46-AFEB-4E40-8E74-DF4F1FC140BB}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/manifest.yaml b/manifest.yaml index 49443d05d2..71e3ebcdf2 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -302,31 +302,11 @@ TriggerPaths: [ Android/SquareOkHttp3-v3 ] MacBuildTargets: [ ci ] WindowsBuildTargets: [ ci ] -- Name: SquareOkHttp3UrlConnection - BuildScript: ./Android/SquareOkHttp3UrlConnection/build.cake - TriggerPaths: [ Android/SquareOkHttp3UrlConnection ] - MacBuildTargets: [ ci ] - WindowsBuildTargets: [ ci ] -- Name: SquareOkHttp3UrlConnectionv3 - BuildScript: ./Android/SquareOkHttp3UrlConnection-v3/build.cake - TriggerPaths: [ Android/SquareOkHttp3UrlConnection-v3 ] - MacBuildTargets: [ ci ] - WindowsBuildTargets: [ ci ] - Name: SquareOkHttp3WS BuildScript: ./Android/SquareOkHttp3WS/build.cake TriggerPaths: [ Android/SquareOkHttp3WS ] MacBuildTargets: [ ci ] WindowsBuildTargets: [ ci ] -- Name: SquareOkHttpUrlConnection - BuildScript: ./Android/SquareOkHttpUrlConnection/build.cake - TriggerPaths: [ Android/SquareOkHttpUrlConnection ] - MacBuildTargets: [ ci ] - WindowsBuildTargets: [ ci ] -- Name: SquareOkHttpWS - BuildScript: ./Android/SquareOkHttpWS/build.cake - TriggerPaths: [ Android/SquareOkHttpWS ] - MacBuildTargets: [ ci ] - WindowsBuildTargets: [ ci ] - Name: SquareOkIO BuildScript: ./Android/SquareOkIO/build.cake TriggerPaths: [ Android/SquareOkIO ]