Upgrade dependencies 🧰 (#14)

panmona · Apr 13, 2022 · e022cc5 · e022cc5
1 parent 5bce655
commit e022cc5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/src/SwitchTubeDl/Api/Api.fs b/src/SwitchTubeDl/Api/Api.fs
@@ -1,7 +1,6 @@
 module TubeDl.Api
 
 open FsHttp
-open FsHttp.DslCE
 open FsToolkit.ErrorHandling
 open Microsoft.FSharpLu
 
@@ -29,37 +28,41 @@ let private apiPrefix = $"%s{baseUrl}/api/v1"
 let private tokenHeader (Token token) = $"Token %s{token}"
 
 let private videoDetails token videoId =
-    httpAsync {
+    http {
         GET $"%s{apiPrefix}/browse/videos/%s{videoId}"
         CacheControl "no-cache"
         Authorization (tokenHeader token)
     }
+    |> Request.sendAsync
 
 let private videoPaths token videoId =
-    httpAsync {
+    http {
         GET $"%s{apiPrefix}/browse/videos/%s{videoId}/video_variants"
         CacheControl "no-cache"
         Authorization (tokenHeader token)
     }
+    |> Request.sendAsync
 
 /// The asset path should contain the whole relative path
 let private downloadVideo _token relativeAssetPath =
     let uri =
         Uri.initRelative baseUrl relativeAssetPath
         |> Uri.absoluteUri
 
-    httpAsync {
+    http {
         GET uri
         CacheControl "no-cache"
     }
+    |> Request.sendAsync
 
 
 let private channelDetails token channelId =
-    httpAsync {
+    http {
         GET $"%s{apiPrefix}/browse/channels/%s{channelId}"
         CacheControl "no-cache"
         Authorization (tokenHeader token)
     }
+    |> Request.sendAsync
 
 let private handleResult (response : Response) =
     match response.statusCode with
@@ -72,11 +75,12 @@ let private handleResult (response : Response) =
     | _ -> Error ApiError
 
 let private channelVideos token url =
-    httpAsync {
+    http {
         GET url
         CacheControl "no-cache"
         Authorization (tokenHeader token)
     }
+    |> Request.sendAsync
 
 let allChannelVideos token channelId =
     let rec collectAllPages accResults nextUrl =

diff --git a/src/SwitchTubeDl/Api/Paging.fs b/src/SwitchTubeDl/Api/Paging.fs
@@ -1,6 +1,5 @@
 module TubeDl.Paging
 
-open FSharp.Data
 open Microsoft.FSharpLu
 
 open TubeDl
@@ -17,7 +16,8 @@ let tryParseLinkHeader (header : string) =
 
 let tryGetNextPageUri (headers : System.Net.Http.Headers.HttpResponseHeaders) =
     let headerOpt =
-        match headers.TryGetValues HttpResponseHeaders.Link with
+        let linkHeader = "Link"
+        match headers.TryGetValues linkHeader with
         | true, value -> value |> Seq.head |> Some
         | _ -> None
 

diff --git a/src/SwitchTubeDl/SwitchTubeDl.fsproj b/src/SwitchTubeDl/SwitchTubeDl.fsproj
@@ -55,7 +55,7 @@
 
     <ItemGroup>
         <PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="2.13.0" />
-        <PackageReference Include="MinVer" Version="2.5.0">
+        <PackageReference Include="MinVer" Version="3.1.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -70,11 +70,12 @@
         </ResolvedFileToPublish>
 
         <PackageReference Include="Argu" Version="6.1.1" />
-        <PackageReference Include="FsHttp" Version="7.0.0" />
+        <PackageReference Include="FsHttp" Version="9.0.4" />
         <PackageReference Include="FsToolkit.ErrorHandling" Version="2.13.0" />
         <PackageReference Include="Microsoft.FSharpLu" Version="0.11.7" />
-        <PackageReference Include="Spectre.Console" Version="0.43.0" />
+        <PackageReference Include="Spectre.Console" Version="0.44.0" />
         <PackageReference Include="Thoth.Json.Net" Version="8.0.0" />
+        <PackageReference Update="FSharp.Core" Version="6.0.3" />
     </ItemGroup>
 
     <Target Name="RemoveMisc" AfterTargets="_PublishNoBuildAlternative">

diff --git a/src/Tests/Tests.fsproj b/src/Tests/Tests.fsproj
@@ -23,6 +23,7 @@
 
     <ItemGroup>
       <PackageReference Include="Expecto" Version="9.0.4" />
+      <PackageReference Update="FSharp.Core" Version="6.0.3" />
     </ItemGroup>
 
     <ItemGroup>