Skip to content

Fix uberjar generation #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2024
Merged

Fix uberjar generation #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e8d633
Fix bad System/getProperty call
eerohele May 5, 2024
b11403c
Remove enable-mac-fullscreen util
eerohele May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/clooj/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,6 @@
(doall (map #(project/add-project app %) (project/load-project-set)))
(let [frame (app :frame)]
(utils/persist-window-shape utils/clooj-prefs "main-window" frame)
(utils/enable-mac-fullscreen frame)
(.setVisible frame true)
(on-window-activation frame #(project/update-project-tree (app :docs-tree))))
(setup-temp-writer app)
Expand Down
11 changes: 1 addition & 10 deletions src/clooj/utils.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
;; identify OS

(defn get-os []
(string/lower-case (.getProperty System "os.name")))
(string/lower-case (System/getProperty "os.name")))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!


(def is-win
(memoize #(not (neg? (.indexOf (get-os) "win")))))
Expand Down Expand Up @@ -558,12 +558,3 @@
java.net.URL.
slurp)
(catch Exception _ nil)))

;; OS-specific utils

(defmacro enable-mac-fullscreen
"Shows the Mac full-screen double arrow, as introduced in
OS X Lion, if possible."
[window]
(when (is-mac)
`(com.apple.eawt.FullScreenUtilities/setWindowCanFullScreen ~window true)))