Skip to content

Commit bda30b2

Browse files
committed
Merge branch 'develop' for v1.3.1
2 parents 440f661 + f119a3a commit bda30b2

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ common sense styling.
88

99
Lein:
1010
```
11-
[org.clojars.mjdowney/excel-clj "1.3.0"]
11+
[org.clojars.mjdowney/excel-clj "1.3.1"]
1212
```
1313

1414
- [Getting Started](#getting-started)

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject org.clojars.mjdowney/excel-clj "1.3.0"
1+
(defproject org.clojars.mjdowney/excel-clj "1.3.1"
22
:description "Generate Excel documents & PDFs from Clojure data."
33
:url "https://github.com/matthewdowney/excel-clj"
44
:license {:name "Eclipse Public License"

src/excel_clj/core.clj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,9 @@
259259
(open (convert-pdf! (example) (temp ".pdf")))
260260

261261
;; Expose ordering / styling issues in v1.2.X
262-
(quick-open
263-
[["Test"
264-
(table
265-
(for [x (range 10000)]
266-
{"N" x "N^2" (* x x) "N^3" (* x x x)}))]])
262+
(quick-open {"Test" (table
263+
(for [x (range 10000)]
264+
{"N" x, "N^2" (* x x), "N^3" (* x x x)}))})
267265

268266
;; Ballpark performance test
269267
(dotimes [_ 5]

src/excel_clj/prototype.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"Prototype features to be included in v2.0.0 -- everything subject to change."
33
{:author "Matthew Downey"}
44
(:require [excel-clj.poi :as poi]
5-
[excel-clj.cell :as cell]
65
[clojure.java.io :as io]
76
[clojure.string :as string]
87
[taoensso.encore :as enc])

src/excel_clj/style.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
workbook :font {:bold true :font-height-in-points 10}))))"
6060
{:author "Matthew Downey"}
6161
(:require [clojure.string :as string]
62-
[clojure.reflect :as reflect])
62+
[clojure.reflect :as reflect]
63+
[rhizome.viz :as viz])
6364
(:import (org.apache.poi.ss.usermodel
6465
DataFormat BorderStyle HorizontalAlignment FontUnderline
6566
FillPatternType)
@@ -348,7 +349,6 @@
348349
"If one wanted to visualize all of the nested setters & POI objects...
349350
Keep in mind that this requires $ apt-get install graphviz"
350351
[]
351-
(require '[rhizome.viz :as viz])
352352
(let [param-type (fn [setter] (resolve (first (:parameter-types setter))))
353353
is-setter? (fn [{:keys [name parameter-types]}]
354354
(and (string/starts-with? (str name) "set")

0 commit comments

Comments
 (0)