Bump version to 1.4.2

fslaborg · Sep 25, 2016 · 41b8010 · 41b8010
1 parent 40ff4d2
commit 41b8010
Show file tree

Hide file tree

Showing 15 changed files with 146 additions and 200 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,11 +1,7 @@
-### 1.4.2-rc003 - September 25, 2016
-
-### 1.4.2-rc002 - September 25, 2016
-* Latest dependencies versions for the XPlot.GoogleCharts package
-
-### 1.4.2-rc001 - September 25, 2016
+### 1.4.2 - September 25, 2016
 * Rationalise the GoogleChart and PlotlyChart types
 * Rationalise the pipeline style helpers
+* Explicit dependencies versions
 
 ### 1.4.1 - July 30, 2016
 * Documentation updates

diff --git a/build.fsx b/build.fsx
@@ -170,7 +170,8 @@ Target "NuGet" (fun _ ->
 Target "PublishNuget" (fun _ ->
     Paket.Push(fun p ->
         { p with
-            WorkingDir = "bin" })
+            WorkingDir = "bin"
+            ApiKey = getBuildParamOrDefault "NugetKey" "" })
 )
 
 // --------------------------------------------------------------------------------------

diff --git a/paket.dependencies b/paket.dependencies
@@ -7,10 +7,8 @@ nuget FAKE
 nuget SourceLink.Fake
 
 nuget Deedle
-nuget FSharp.Data
 nuget MathNet.Numerics
 nuget Google.DataTable.Net.Wrapper
-nuget Http.fs
 nuget Newtonsoft.Json
 
 github fsharp/FAKE modules/Octokit/Octokit.fsx
diff --git a/paket.lock b/paket.lock
@@ -1,23 +1,15 @@
 NUGET
   remote: https://www.nuget.org/api/v2
     Deedle (1.2.5)
-    FAKE (4.35.1)
+    FAKE (4.40)
     FSharp.Compiler.Service (2.0.0.6)
-    FSharp.Core (4.0.0.1)
-    FSharp.Data (2.3.2)
-      Zlib.Portable (>= 1.11) - framework: portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81
     FSharp.Formatting (2.14.4)
       FSharp.Compiler.Service (2.0.0.6)
       FSharpVSPowerTools.Core (>= 2.3 < 2.4)
     FSharpVSPowerTools.Core (2.3)
       FSharp.Compiler.Service (>= 2.0.0.3)
     Google.DataTable.Net.Wrapper (3.1.2)
-    Hopac (0.3)
-      FSharp.Core (>= 3.1.2.5)
-    Http.fs (3.0.6)
-      FSharp.Core (>= 3.1.2.5)
-      Hopac (>= 0.3)
-    MathNet.Numerics (3.12)
+    MathNet.Numerics (3.13.1)
       TaskParallelLibrary (>= 1.0.2856) - framework: net35
     Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
       Microsoft.Bcl.Build (>= 1.0.14)
@@ -81,7 +73,7 @@ NUGET
       NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
       NUnit.Extension.TeamCityEventListener (>= 1.0.1)
       NUnit.Extension.VSProjectLoader (>= 3.4.1)
-    Octokit (0.21.1)
+    Octokit (0.22)
       Microsoft.Net.Http  - framework: net10, net11, net20, net30, net35, net40, net40-full
     SourceLink.Fake (1.1)
     System.Collections (4.0.11) - framework: >= netstandard10
@@ -280,8 +272,7 @@ NUGET
       System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13
       System.Xml.ReaderWriter (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
     TaskParallelLibrary (1.0.2856) - framework: net35
-    Zlib.Portable (1.11) - framework: portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (def4ef86c0552d7126cbe6756c7b7fdda447245d)
+    modules/Octokit/Octokit.fsx (dab7b5aea40c0855cf35fc7d6e67fa4f411fb24b)
       Octokit (>= 0.20)
diff --git a/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs b/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs
@@ -1,4 +1,5 @@
-namespace System
+// Auto-Generated by FAKE; do not edit
+namespace System
 open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("XPlot.GoogleCharts.Deedle")>]

diff --git a/src/XPlot.GoogleCharts.Deedle/paket.template b/src/XPlot.GoogleCharts.Deedle/paket.template
@@ -2,7 +2,7 @@ type project
 owners
     Taha Hachana
 authors
-    Taha Hachana
+    Taha Hachana, Tomas Petricek
 projectUrl
     http://github.com/TahaHachana/XPlot
 iconUrl
@@ -19,3 +19,6 @@ summary
     Data visualization library for F#
 description
     XPlot is a cross-platform data visualization library that supports creating charts using Google Charts and Plotly. The library provides a composable domain specific language for building charts and specifying their properties.
+dependencies
+    Deedle = LOCKEDVERSION
+    XPlot.GoogleCharts = CURRENTVERSION
diff --git a/src/XPlot.GoogleCharts/AssemblyInfo.fs b/src/XPlot.GoogleCharts/AssemblyInfo.fs
@@ -1,4 +1,5 @@
-namespace System
+// Auto-Generated by FAKE; do not edit
+namespace System
 open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("XPlot.GoogleCharts")>]

diff --git a/src/XPlot.GoogleCharts/Main.fs b/src/XPlot.GoogleCharts/Main.fs
@@ -64,7 +64,7 @@ module Data =
             match Seq.length series with
             | 1 ->
                 series
-                |> Seq.nth 0
+                |> Seq.item 0
                 |> fun x ->
                     x.DataPoints
                     |> Seq.map (fun dp ->
@@ -123,7 +123,7 @@ module Data =
                 | false -> Seq.append ["Column 1"] labelsSeq
                 | true -> labelsSeq
 
-        sysDt.Columns.Add(Seq.nth 0 labels', (fst longestRow).GetType())
+        sysDt.Columns.Add(Seq.item 0 labels', (fst longestRow).GetType())
         |> ignore
 
         let values = Seq.map snd rows 
@@ -138,7 +138,7 @@ module Data =
                     | _ -> fst x.[idx])
                 |> Option.get
                 |> fun x -> x.GetType()
-            sysDt.Columns.Add(Seq.nth (idx + 1) labels', columnType)
+            sysDt.Columns.Add(Seq.item (idx + 1) labels', columnType)
             |> ignore
         )