diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,10 @@ # Revision history for wild-bind-task-x11 +## 0.2.0.4 -- 2024-09-25 + +* Update the dependency version bounds, generated by cabal-plan-bounds and GitHub Workflow. + Now it adds support for some new dependency versions, but drop support for some old versions. + ## 0.2.0.3 -- 2021-03-25 * Bug fix: Now `wildNumPad` initializes `WildBind.X11` first, and then `WildBind.Indicator`. diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/src/WildBind/Task/X11.hs b/src/WildBind/Task/X11.hs --- a/src/WildBind/Task/X11.hs +++ b/src/WildBind/Task/X11.hs @@ -2,46 +2,53 @@ -- Module: WildBind.Task.X11 -- Description: Task to install and export everything you need to use WildBind in X11 -- Maintainer: Toshio Ito --- +-- -- This module exports everything you probably need to use WildBind in -- X11 environments. module WildBind.Task.X11 - ( -- * Execution - wildNumPad, - wildNumPad', - -- * Re-exports - module WildBind.Binding, - module WildBind.Description, - module WildBind.Input.NumPad, - -- ** From basic modules - module Control.Monad.IO.Class, - module Control.Monad.Trans.State, - module Data.Monoid, - Text, - -- ** From "WindBind.X11" - Window, ActiveWindow, winInstance, winClass, winName, - -- ** From "WildBind.Indicator" - Indicator, NumPadPosition(..), updateDescription, getPresence, setPresence, togglePresence, quit - ) where + ( -- * Execution + wildNumPad + , wildNumPad' + -- * Re-exports + , module WildBind.Binding + , module WildBind.Description + , module WildBind.Input.NumPad + -- ** From basic modules + , module Control.Monad.IO.Class + , module Control.Monad.Trans.State + , module Data.Monoid + , Text + -- ** From "WindBind.X11" + , Window + , ActiveWindow + , winInstance + , winClass + , winName + -- ** From "WildBind.Indicator" + , Indicator + , NumPadPosition (..) + , updateDescription + , getPresence + , setPresence + , togglePresence + , quit + ) where -import Control.Monad.IO.Class -import Control.Monad.Trans.State -import Data.Monoid -import Data.Text (Text) +import Control.Monad.IO.Class +import Control.Monad.Trans.State +import Data.Monoid +import Data.Text (Text) -import WildBind.Binding -import WildBind.Description -import WildBind.Input.NumPad -import WildBind.X11 - ( Window, ActiveWindow, winInstance, winClass, winName, - withFrontEnd - ) -import WildBind.Indicator - ( Indicator, NumPadPosition(..), - updateDescription, getPresence, setPresence, togglePresence, quit, - withNumPadIndicator, wildBindWithIndicator, toggleBinding - ) -import WildBind.X11.Internal.Key (XKeyInput) +import WildBind.Binding +import WildBind.Description +import WildBind.Indicator (Indicator, NumPadPosition (..), getPresence, quit, + setPresence, toggleBinding, togglePresence, + updateDescription, wildBindWithIndicator, + withNumPadIndicator) +import WildBind.Input.NumPad +import WildBind.X11 (ActiveWindow, Window, winClass, winInstance, winName, + withFrontEnd) +import WildBind.X11.Internal.Key (XKeyInput) -- | A convenient function to create an executable action with X11 -- 'FrontEnd' and 'Indicator' for a number pad. @@ -49,7 +56,7 @@ -- > main :: IO () -- > main = wildNumPad $ binds $ do -- > on NumCenter `run` putStrLn "You pushed center." --- +-- -- Note that the executable must be compiled by ghc with -- __@-threaded@ option enabled.__ -- diff --git a/src/WildBind/Task/X11/Seq/Example.hs b/src/WildBind/Task/X11/Seq/Example.hs --- a/src/WildBind/Task/X11/Seq/Example.hs +++ b/src/WildBind/Task/X11/Seq/Example.hs @@ -7,23 +7,16 @@ -- for key sequences. See the source. -- -- @since 0.2.0.0 -module WildBind.Task.X11.Seq.Example - where +module WildBind.Task.X11.Seq.Example where -import Data.Monoid ((<>)) +import Data.Monoid ((<>)) -- Following is from wild-bind package -import WildBind (Binding, wildBind, binds, on, run) -import WildBind.Seq - ( SeqBinding, - prefix, fromSeq, toSeq, withCancel, withPrefix - ) +import WildBind (Binding, binds, on, run, wildBind) +import WildBind.Seq (SeqBinding, fromSeq, prefix, toSeq, withCancel, withPrefix) -- Following is from wild-bind-x11 package -import WildBind.X11 - ( XKeyEvent, ActiveWindow, - withFrontEnd, ctrl, press - ) +import WildBind.X11 (ActiveWindow, XKeyEvent, ctrl, press, withFrontEnd) import qualified WildBind.X11.KeySym as Sym main :: IO () diff --git a/test/ImportTest.hs b/test/ImportTest.hs --- a/test/ImportTest.hs +++ b/test/ImportTest.hs @@ -1,13 +1,9 @@ -module Main (main) where +module Main + ( main + ) where -import WildBind.Task.X11 - ( wildNumPad, wildNumPad', - Binding, Binding', - NumPadUnlocked(..), NumPadLocked(..), - ActiveWindow, - Indicator, - (<>) - ) +import WildBind.Task.X11 (ActiveWindow, Binding, Binding', Indicator, NumPadLocked (..), + NumPadUnlocked (..), wildNumPad, wildNumPad', (<>)) main :: IO () main = putStrLn "If it compiles, it's ok." diff --git a/wild-bind-task-x11.cabal b/wild-bind-task-x11.cabal --- a/wild-bind-task-x11.cabal +++ b/wild-bind-task-x11.cabal @@ -1,5 +1,5 @@ name: wild-bind-task-x11 -version: 0.2.0.3 +version: 0.2.0.4 author: Toshio Ito maintainer: Toshio Ito license: BSD3 @@ -7,7 +7,7 @@ synopsis: Task to install and export everything you need to use WildBind in X11 description: Task to install and export everything you need to use WildBind in X11. See category: UserInterface -cabal-version: >= 1.10 +cabal-version: 2.0 build-type: Simple extra-source-files: README.md, ChangeLog.md homepage: https://github.com/debug-ito/wild-bind @@ -20,12 +20,12 @@ exposed-modules: WildBind.Task.X11, WildBind.Task.X11.Seq.Example -- other-modules: - build-depends: base >=4.6 && <5.0, - wild-bind >=0.1.1.0 && <0.2, - wild-bind-x11 >=0.2.0.0 && <0.3, - wild-bind-indicator >=0.2.0.0 && <1.1, - text >=1.2.0 && <1.3, - transformers >=0.3.0 && <0.6 + build-depends: base ^>=4.14.3 || ^>=4.15.0 || ^>=4.16.0 || ^>=4.17.0 || ^>=4.18.0 || ^>=4.19.0 || ^>=4.20.0, + wild-bind ^>=0.1.2, + wild-bind-x11 ^>=0.2.0, + wild-bind-indicator ^>=1.0.0, + text ^>=1.2.4 || ^>=2.0.1 || ^>=2.1, + transformers ^>=0.5.6 || ^>=0.6.1 -- executable wild-bind-task-x11 -- default-language: Haskell2010 @@ -44,7 +44,8 @@ main-is: ImportTest.hs -- default-extensions: -- other-modules: - build-depends: base, wild-bind-task-x11 + build-depends: base ^>=4.14.3 || ^>=4.15.0 || ^>=4.16.0 || ^>=4.17.0 || ^>=4.18.0 || ^>=4.19.0 || ^>=4.20.0, + wild-bind-task-x11 source-repository head type: git