Adapt to FsCodec name changes

CHANGELOG.md

@@ -12,6 +12,7 @@ The `Unreleased` section name is replaced by the expected version of next releas
 ### Changed
 
 - Updated `MinVer` to `2.0.0-alpha.2`
+- Updated `FsCodec` to `1.0.0-pr.20.rc2.5` to pick up final name changes [#162](https://github.com/jet/equinox/pull/162)
 - Replaced `TargetId.AggregateIdEmpty` with `ResolveOption.AssumeEmpty` [#163](https://github.com/jet/equinox/pull/163)
 
 ### Removed

samples/Store/Domain/Domain.fsproj

@@ -21,7 +21,7 @@
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0-pr.20.rc2.5" />
     <PackageReference Include="FSharp.UMX" Version="1.0.0" />
   </ItemGroup>
 

samples/Store/Integration/CodecIntegration.fs

@@ -44,6 +44,6 @@ let codec = FsCodec.NewtonsoftJson.Codec.Create()
 let ``Can roundtrip, rendering correctly`` (x: SimpleDu) =
     let serialized = codec.Encode x
     render x =! if serialized.Data = null then null else System.Text.Encoding.UTF8.GetString(serialized.Data)
-    let adapted = FsCodec.Core.IndexedEventData(-1L,false,serialized.EventType,serialized.Data,serialized.Meta,serialized.Timestamp)
+    let adapted = FsCodec.Core.TimelineEvent.Create(-1L, serialized.EventType, serialized.Data, serialized.Meta, serialized.Timestamp)
     let deserialized = codec.TryDecode adapted |> Option.get
     deserialized =! x

samples/Tutorial/AsAt.fsx

@@ -49,7 +49,7 @@ module Events =
     // unlike most normal codecs, we have a mapping to supply as we want the Index to be added to each event so we can track it in the State as we fold
     let codec =
         // our upconversion function doesn't actually fit the term - it just tuples the underlying event
-        let up (evt : FsCodec.IIndexedEvent<_>,e) : Event =
+        let up (evt : FsCodec.ITimelineEvent<_>,e) : Event =
             evt.Index,e
         // as per the `up`, the downcoverter needs to drop the index (which is only there for symmetry), add null metadata
         let down (_,e) : Contract * _ option * DateTimeOffset option =

src/Equinox.Cosmos/Equinox.Cosmos.fsproj

@@ -26,7 +26,7 @@
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0-pr.20.rc2.5" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
     <PackageReference Include="Microsoft.Azure.DocumentDB" Version="2.0.0" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.0.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />

src/Equinox.EventStore/Equinox.EventStore.fsproj

@@ -27,7 +27,7 @@
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
 
     <PackageReference Include="EventStore.Client" Version="5.0.1" />
-    <PackageReference Include="FsCodec" Version="1.0.0-rc2" />
+    <PackageReference Include="FsCodec" Version="1.0.0-pr.20.rc2.5" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
     <PackageReference Include="System.Runtime.Caching" Version="4.5.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
     <Reference Include="System.Runtime.Caching" Condition=" '$(TargetFramework)' != 'netstandard2.0'" />

src/Equinox.EventStore/EventStore.fs

@@ -269,12 +269,12 @@ module private Read =
         return version, events }
 
 module UnionEncoderAdapters =
-    let encodedEventOfResolvedEvent (x : ResolvedEvent) : FsCodec.IIndexedEvent<byte[]> =
+    let encodedEventOfResolvedEvent (x : ResolvedEvent) : FsCodec.ITimelineEvent<byte[]> =
         let e = x.Event
         // Inspecting server code shows both Created and CreatedEpoch are set; taking this as it's less ambiguous than DateTime in the general case
         let ts = DateTimeOffset.FromUnixTimeMilliseconds(e.CreatedEpoch)
-        FsCodec.Core.IndexedEventData(e.EventNumber, (*isUnfold*)false, e.EventType, e.Data, e.Metadata, ts) :> _
-    let eventDataOfEncodedEvent (x : FsCodec.IEvent<byte[]>) =
+        FsCodec.Core.TimelineEvent.Create(e.EventNumber, e.EventType, e.Data, e.Metadata, ts) :> _
+    let eventDataOfEncodedEvent (x : FsCodec.IEventData<byte[]>) =
         EventData(Guid.NewGuid(), x.EventType, (*isJson*) true, x.Data, x.Meta)
 
 type Stream = { name: string }
@@ -378,7 +378,7 @@ type Context(conn : Connection, batching : BatchingPolicy) =
                 | Some compactionEventIndex ->
                     Token.ofPreviousStreamVersionAndCompactionEventDataIndex streamToken compactionEventIndex encodedEvents.Length batching.BatchSize version'
         return GatewaySyncResult.Written token }
-    member __.Sync(log, streamName, streamVersion, events: FsCodec.IEvent<byte[]>[]) : Async<GatewaySyncResult> = async {
+    member __.Sync(log, streamName, streamVersion, events: FsCodec.IEventData<byte[]>[]) : Async<GatewaySyncResult> = async {
         let encodedEvents : EventData[] = events |> Array.map UnionEncoderAdapters.eventDataOfEncodedEvent
         let! wr = Write.writeEvents log conn.WriteRetryPolicy conn.WriteConnection streamName streamVersion encodedEvents
         match wr with

tests/Equinox.Cosmos.Integration/CosmosCoreIntegration.fs

@@ -2,9 +2,8 @@
 
 open Equinox.Cosmos.Core
 open Equinox.Cosmos.Integration.Infrastructure
+open FsCodec
 open FSharp.Control
-open FsCodec // Shadow FSharp.Control.IEvent
-open FsCodec.Core
 open Newtonsoft.Json.Linq
 open Swensen.Unquote
 open Serilog
@@ -92,7 +91,7 @@ type Tests(testOutputHelper) =
         return TestEvents.Create(0,6)
     }
 
-    let verifyCorrectEventsEx direction baseIndex (expected: IEvent<_>[]) (xs: IIndexedEvent<_>[]) =
+    let verifyCorrectEventsEx direction baseIndex (expected: IEventData<_>[]) (xs: ITimelineEvent<byte[]>[]) =
         let xs, baseIndex =
             if direction = Equinox.Cosmos.Store.Direction.Forward then xs, baseIndex
             else Array.rev xs, baseIndex - int64 (Array.length expected) + 1L

tests/Equinox.Cosmos.Integration/JsonConverterTests.fs

@@ -46,6 +46,6 @@ type Base64ZipUtf8Tests() =
         let ser = JsonConvert.SerializeObject(e)
         test <@ ser.Contains("\"d\":\"") @>
         let des = JsonConvert.DeserializeObject<Store.Unfold>(ser)
-        let d = FsCodec.Core.IndexedEventData(-1L, false, des.c, des.d, null, DateTimeOffset.UtcNow)
+        let d = FsCodec.Core.TimelineEvent.Create(-1L, des.c, des.d)
         let decoded = unionEncoder.TryDecode d |> Option.get
         test <@ value = decoded @>

tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj

@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="FsCheck.xUnit" Version="2.13.0" />
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0-rc2" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="1.0.0-pr.20.rc2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
     <Reference Include="System.Runtime.Caching" Condition=" '$(TargetFramework)' != 'netstandard2.0'" />