Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions changelog.d/5-internal/brig-typese-remove-reexports
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
brig-types: remove all re-exports
10 changes: 1 addition & 9 deletions libs/brig-types/brig-types.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
-- hash: 2e6bc533a2e630a022751905d911a3d50831c4351143ff9d1e0eb07d298ae422
-- hash: 208f0e0b617d4b77a178515ad4feb886ef0dcef8997be2174e4ae72b78dccd7e

name: brig-types
version: 1.35.0
Expand All @@ -19,22 +19,14 @@ build-type: Simple

library
exposed-modules:
Brig.Types
Brig.Types.Activation
Brig.Types.Calling
Brig.Types.Client
Brig.Types.Client.Prekey
Brig.Types.Code
Brig.Types.Common
Brig.Types.Connection
Brig.Types.Instances
Brig.Types.Intra
Brig.Types.Provider
Brig.Types.Provider.External
Brig.Types.Provider.Tag
Brig.Types.Search
Brig.Types.Team
Brig.Types.Team.Invitation
Brig.Types.Team.LegalHold
Brig.Types.Test.Arbitrary
Brig.Types.User
Expand Down
29 changes: 0 additions & 29 deletions libs/brig-types/src/Brig/Types.hs

This file was deleted.

10 changes: 0 additions & 10 deletions libs/brig-types/src/Brig/Types/Activation.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,9 @@

module Brig.Types.Activation
( ActivationPair,

-- * re-exports
module C,
ActivationKey (..),
ActivationCode (..),
Activate (..),
ActivationTarget (..),
ActivationResponse (..),
SendActivationCode (..),
)
where

import Brig.Types.Common as C
import Wire.API.User.Activation

-- | A pair of 'ActivationKey' and 'ActivationCode' as required for activation.
Expand Down
53 changes: 0 additions & 53 deletions libs/brig-types/src/Brig/Types/Calling.hs

This file was deleted.

36 changes: 0 additions & 36 deletions libs/brig-types/src/Brig/Types/Client.hs

This file was deleted.

32 changes: 0 additions & 32 deletions libs/brig-types/src/Brig/Types/Client/Prekey.hs

This file was deleted.

28 changes: 0 additions & 28 deletions libs/brig-types/src/Brig/Types/Code.hs

This file was deleted.

33 changes: 0 additions & 33 deletions libs/brig-types/src/Brig/Types/Common.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,37 +29,6 @@ module Brig.Types.Common
isValidPhonePrefix,
allPrefixes,
ExcludedPrefix (..),

-- * re-exports
Name (..),
ColourId (..),
defaultAccentId,
Email (..),
fromEmail,
parseEmail,
validateEmail,
Phone (..),
parsePhone,
isValidPhone,
UserIdentity (..),
newIdentity,
emailIdentity,
phoneIdentity,
ssoIdentity,
UserSSOId (..),
Asset (..),
AssetSize (..),
Language (..),
lan2Text,
parseLanguage,
Country (..),
con2Text,
parseCountry,
Locale (..),
locToText,
parseLocale,
ManagedBy (..),
defaultManagedBy,
)
where

Expand All @@ -70,8 +39,6 @@ import Data.ByteString.Conversion
import qualified Data.Text as Text
import Data.Time.Clock (NominalDiffTime)
import Imports
import Wire.API.User.Identity
import Wire.API.User.Profile

------------------------------------------------------------------------------
--- PhoneBudgetTimeout
Expand Down
8 changes: 0 additions & 8 deletions libs/brig-types/src/Brig/Types/Connection.hs
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ module Brig.Types.Connection
( module C,
UserIds (..),
UpdateConnectionsInternal (..),

-- * re-exports
Relation (..),
UserConnection (..),
ConnectionRequest (..),
ConnectionUpdate (..),
UserConnectionList (..),
)
where

Expand All @@ -40,7 +33,6 @@ import Data.Id (UserId)
import Data.Qualified
import Imports
import Wire.API.Arbitrary
import Wire.API.Connection

-- | Response type for endpoints returning lists of users with a specific connection state.
-- E.g. 'getContactList' returns a 'UserIds' containing the list of connections in an
Expand Down
10 changes: 4 additions & 6 deletions libs/brig-types/src/Brig/Types/Instances.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@
-- You should have received a copy of the GNU Affero General Public License along
-- with this program. If not, see <https://www.gnu.org/licenses/>.

module Brig.Types.Instances
(
)
where
module Brig.Types.Instances () where

import Brig.Types.Client.Prekey
import Brig.Types.Provider
import Brig.Types.Provider.Tag
import Cassandra.CQL
import Data.ByteString.Conversion
import Imports
import Wire.API.Provider
import Wire.API.Provider.Service
import Wire.API.User.Client.Prekey

instance Cql PrekeyId where
ctype = Tagged IntColumn
Expand Down
4 changes: 1 addition & 3 deletions libs/brig-types/src/Brig/Types/Intra.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,14 @@ module Brig.Types.Intra
)
where

import Brig.Types.Connection
import Brig.Types.User
import Data.Aeson
import qualified Data.Aeson.KeyMap as KeyMap
import Data.Code as Code
import Data.Id (TeamId, UserId)
import Data.Misc (PlainTextPassword (..))
import qualified Data.Text as Text
import Imports
import Wire.API.User (VerificationAction (..))
import Wire.API.User

-------------------------------------------------------------------------------
-- AccountStatus
Expand Down
Loading