Bump version to 1.1.4

ed-ilyin · Aug 10, 2017 · 3aca59f · 3aca59f
1 parent 3737b73
commit 3aca59f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.1.4
+* makes Decode.result decode to Result<_,string>
+
 ### 1.1.3
 * adds Json.Decode.bool
 

diff --git a/docs/reference/fsharp-edilyin-core-decode.html b/docs/reference/fsharp-edilyin-core-decode.html
@@ -572,7 +572,7 @@ <h3>Functions and values</h3>
             result decoder
           </code>
           <div class="tip" id="47">
-            <strong>Signature:</strong> decoder:Decoder&lt;&#39;?7797,&#39;?7798&gt; -&gt; Decoder&lt;&#39;?7797,Result&lt;&#39;?7798,Error&gt;&gt;<br />
+            <strong>Signature:</strong> decoder:Decoder&lt;&#39;?7797,&#39;?7798&gt; -&gt; Decoder&lt;&#39;?7797,Result&lt;&#39;?7798,string&gt;&gt;<br />
                           <strong>Type parameters:</strong> '?7797, '?7798          </div>
         </td>
         <td class="xmldoc">

diff --git a/docs/release-notes.html b/docs/release-notes.html
@@ -32,6 +32,10 @@ <h3 class="muted"><a href="/FSharp.EdIlyin.Core/index.html">FSharp.EdIlyin.Core<
       <div class="row">
         <div class="span9" id="main">
 
+<h3><a name="1-1-4" class="anchor" href="#1-1-4">1.1.4</a></h3>
+<ul>
+<li>makes Decode.result decode to Result<_,string></li>
+</ul>
 <h3><a name="1-1-3" class="anchor" href="#1-1-3">1.1.3</a></h3>
 <ul>
 <li>adds Json.Decode.bool</li>

diff --git a/src/FSharp.EdIlyin.Core/AssemblyInfo.fs b/src/FSharp.EdIlyin.Core/AssemblyInfo.fs
@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.EdIlyin.Core")>]
 [<assembly: AssemblyProductAttribute("FSharp.EdIlyin.Core")>]
 [<assembly: AssemblyDescriptionAttribute("Project has no summmary; update build.fsx")>]
-[<assembly: AssemblyVersionAttribute("1.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.3")>]
+[<assembly: AssemblyVersionAttribute("1.1.4")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.4")>]
 [<assembly: AssemblyConfigurationAttribute("Release")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.EdIlyin.Core"
     let [<Literal>] AssemblyProduct = "FSharp.EdIlyin.Core"
     let [<Literal>] AssemblyDescription = "Project has no summmary; update build.fsx"
-    let [<Literal>] AssemblyVersion = "1.1.3"
-    let [<Literal>] AssemblyFileVersion = "1.1.3"
+    let [<Literal>] AssemblyVersion = "1.1.4"
+    let [<Literal>] AssemblyFileVersion = "1.1.4"
     let [<Literal>] AssemblyConfiguration = "Release"
diff --git a/src/FSharp.EdIlyin.Core/Decode.fs b/src/FSharp.EdIlyin.Core/Decode.fs
@@ -166,7 +166,7 @@ let resultFromResult =
         | Ok x -> Ok x
 
 
-let result decoder = run decoder >> Ok |> fromFunction
+let result decoder = decode decoder >> Ok |> fromFunction
 
 
 let errorMessage errorMessage = ErrorMessage errorMessage |> Error
@@ -200,7 +200,7 @@ let orElse decoder2 decoder1 =
         |> andThen
             (function
                 | Error _ -> decoder2
-                | Ok v -> Ok v |> fromDecodeResult
+                | Ok v -> Ok v |> fromResult
             )
 
 

diff --git a/tests/FSharp.EdIlyin.Core.Tests/FSharp.EdIlyin.Core.Tests.fsproj b/tests/FSharp.EdIlyin.Core.Tests/FSharp.EdIlyin.Core.Tests.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -96,4 +96,4 @@
       <Paket>True</Paket>
     </Reference>
   </ItemGroup>
-</Project>
+</Project>