Skip to content

Commit 1634367

Browse files
brendanhaybrendanhay
committed
amazonka-core: update top-level dependencies on amazonka-core
1 parent 524fde6 commit 1634367

File tree

14 files changed

+39
-60
lines changed

14 files changed

+39
-60
lines changed

‎WORKSPACE

-2
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ stack_snapshot(
318318
"retry",
319319
"scientific", # keep
320320
"semigroups",
321-
"tagged",
322321
"tasty",
323322
"tasty-hunit",
324323
"tasty-quickcheck",
@@ -329,7 +328,6 @@ stack_snapshot(
329328
"transformers", # keep
330329
"unexceptionalio", # keep
331330
"unliftio", # keep
332-
"unliftio-core",
333331
"unordered-containers", # keep
334332
"xml-conduit",
335333
"xml-types",

‎configs/templates/cabal.ede

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ test-suite {{ libraryName }}-test
7070
-- hand outside these namespaces will not correctly be added to the
7171
-- distribution package.
7272
other-modules:
73-
Test.AWS.{{ serviceAbbrev }}
74-
, Test.AWS.Gen.{{ serviceAbbrev }}
75-
, Test.AWS.{{ serviceAbbrev }}.Internal
73+
Test.Amazonka.{{ serviceAbbrev }}
74+
, Test.Amazonka.Gen.{{ serviceAbbrev }}
75+
, Test.Amazonka.{{ serviceAbbrev }}.Internal
7676

7777
build-depends:
7878
amazonka-core == {{ clientVersion }}.*

‎configs/templates/test/fixtures.ede

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
module {{ moduleName }} where
99

1010
import qualified Data.Proxy as Proxy
11-
import Test.AWS.Fixture
12-
import Test.AWS.Prelude
11+
import Test.Amazonka.Fixture
12+
import Test.Amazonka.Prelude
1313
import Test.Tasty
1414
{% for import in moduleImports %}
1515
import {{ import.value }}

‎configs/templates/types.ede

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import {{ import.value }}
5656
import {{ moduleName }}.{{ shape.value.name }}
5757
{% when "sum" %}
5858
import {{ moduleName }}.{{ shape.value.name }}
59-
{% endcase %}
59+
{% endcase %}
6060
{% endfor %}
6161

6262
{% include "_include/function.ede" with function = serviceInstance %}

‎gen/src/Gen/Types/Config.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ libraryNS, typesNS, waitersNS, fixturesNS, lensNS :: Getter Library NS
187187
libraryNS = serviceAbbrev . to (mappend "Amazonka" . mkNS)
188188
typesNS = libraryNS . to (<> "Types")
189189
waitersNS = libraryNS . to (<> "Waiters")
190-
fixturesNS = serviceAbbrev . to (mappend "Test.AWS.Gen" . mkNS)
190+
fixturesNS = serviceAbbrev . to (mappend "Test.Amazonka.Gen" . mkNS)
191191
lensNS = libraryNS . to (<> "Lens")
192192

193193
otherModules :: Getter Library [NS]

‎lib/amazonka-core/BUILD.bazel

+2-6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ haskell_library(
7272
"-XGADTs",
7373
"-XPackageImports",
7474
"-XStandaloneDeriving",
75+
"-fwarn-unused-packages",
7576
],
7677
hidden_modules = [],
7778
version = "2.0",
@@ -86,24 +87,18 @@ haskell_library(
8687
"@stackage//:conduit-extra",
8788
"@stackage//:cryptonite",
8889
"@stackage//:deepseq",
89-
"@stackage//:directory",
9090
"@stackage//:hashable",
9191
"@stackage//:http-client",
9292
"@stackage//:http-conduit",
9393
"@stackage//:http-types",
94-
"@stackage//:ini",
9594
"@stackage//:lens",
9695
"@stackage//:memory",
97-
"@stackage//:mtl",
9896
"@stackage//:regex-posix",
9997
"@stackage//:resourcet",
100-
"@stackage//:retry",
10198
"@stackage//:scientific",
102-
"@stackage//:tagged",
10399
"@stackage//:text",
104100
"@stackage//:time",
105101
"@stackage//:transformers",
106-
"@stackage//:unliftio-core",
107102
"@stackage//:unordered-containers",
108103
"@stackage//:xml-conduit",
109104
"@stackage//:xml-types",
@@ -168,6 +163,7 @@ haskell_test(
168163
"-XGADTs",
169164
"-XPackageImports",
170165
"-XStandaloneDeriving",
166+
"-fwarn-unused-packages",
171167
],
172168
version = "2.0",
173169
visibility = ["//visibility:public"],

‎lib/amazonka-s3-encryption/BUILD.bazel

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@ haskell_library(
4343
"-fwarn-incomplete-record-updates",
4444
"-fwarn-missing-deriving-strategies",
4545
"-DVERSION_amazonka_s3_encryption=\"2.0\"",
46+
"-fwarn-unused-packages",
4647
],
4748
hidden_modules = [],
4849
version = "2.0",
4950
visibility = ["//visibility:public"],
5051
deps = [
5152
"//lib/amazonka",
53+
"//lib/amazonka-core",
5254
"//lib/services/amazonka-kms",
5355
"//lib/services/amazonka-s3",
5456
"@stackage//:aeson",
@@ -83,7 +85,7 @@ haskell_test(
8385
visibility = ["//visibility:public"],
8486
deps = [
8587
":amazonka-s3-encryption",
86-
"//lib/amazonka",
88+
"//lib/amazonka-core",
8789
"//lib/amazonka-test",
8890
"@stackage//:QuickCheck",
8991
"@stackage//:base",

‎lib/amazonka-s3-encryption/amazonka-s3-encryption.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ library
9393
build-depends:
9494
, aeson >=1.3 && <1.6
9595
, amazonka ^>=2.0
96+
, amazonka-core ^>=2.0
9697
, amazonka-kms ^>=2.0
9798
, amazonka-s3 ^>=2.0
9899
, bytestring >=0.10.8
@@ -119,7 +120,7 @@ test-suite amazonka-s3-encryption-test
119120
-- distribution package.
120121
other-modules: Test.Amazonka.S3.Encryption.Envelope
121122
build-depends:
122-
, amazonka
123+
, amazonka-core
123124
, amazonka-s3-encryption
124125
, amazonka-test ^>=2.0
125126
, base

‎lib/amazonka-s3-encryption/src/Amazonka/S3/Encryption.hs

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ import Amazonka.S3.Encryption.Envelope
9393
import Amazonka.S3.Encryption.Instructions
9494
import Amazonka.S3.Encryption.Types
9595
import Control.Lens
96-
import Control.Monad.Reader
9796
import Crypto.PubKey.RSA.Types as RSA
9897
import Crypto.Random
9998

‎lib/amazonka-test/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ haskell_library(
2121
version = "2.0",
2222
visibility = ["//visibility:public"],
2323
deps = [
24-
"//lib/amazonka",
24+
"//lib/amazonka-core",
2525
"@stackage//:aeson",
2626
"@stackage//:base",
2727
"@stackage//:bifunctors",

‎lib/amazonka-test/amazonka-test.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ library
4242

4343
build-depends:
4444
, aeson >=1.3
45-
, amazonka ^>=2.0
45+
, amazonka-core ^>=2.0
4646
, base >=4.12 && <5
4747
, bifunctors >=4.1
4848
, bytestring >=0.10.8

‎lib/amazonka/BUILD.bazel

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@rules_haskell//haskell:defs.bzl", "haskell_library", "haskell_test")
1+
load("@rules_haskell//haskell:defs.bzl", "haskell_library")
22

33
# rule generated from amazonka/amazonka.cabal by gazelle_cabal
44
haskell_library(
@@ -49,6 +49,7 @@ haskell_library(
4949
"-fwarn-incomplete-record-updates",
5050
"-fwarn-missing-deriving-strategies",
5151
"-DVERSION_amazonka=\"2.0\"",
52+
"-fwarn-unused-packages",
5253
],
5354
hidden_modules = [
5455
"Amazonka.Bytes",
@@ -76,35 +77,18 @@ haskell_library(
7677
visibility = ["//visibility:public"],
7778
deps = [
7879
"//lib/amazonka-core",
79-
"@stackage//:aeson",
80-
"@stackage//:attoparsec",
8180
"@stackage//:base",
8281
"@stackage//:bytestring",
83-
"@stackage//:case-insensitive",
8482
"@stackage//:conduit",
85-
"@stackage//:conduit-extra",
86-
"@stackage//:cryptonite",
87-
"@stackage//:deepseq",
8883
"@stackage//:directory",
89-
"@stackage//:hashable",
9084
"@stackage//:http-client",
9185
"@stackage//:http-conduit",
9286
"@stackage//:http-types",
9387
"@stackage//:ini",
94-
"@stackage//:lens",
95-
"@stackage//:memory",
96-
"@stackage//:mtl",
97-
"@stackage//:regex-posix",
9888
"@stackage//:resourcet",
9989
"@stackage//:retry",
100-
"@stackage//:scientific",
101-
"@stackage//:tagged",
10290
"@stackage//:text",
10391
"@stackage//:time",
10492
"@stackage//:transformers",
105-
"@stackage//:unliftio-core",
106-
"@stackage//:unordered-containers",
107-
"@stackage//:xml-conduit",
108-
"@stackage//:xml-types",
10993
],
11094
)

‎lib/amazonka/amazonka.cabal

+9-10
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,13 @@ library
9191
, amazonka-core ^>=2.0
9292
, text >=1.1
9393
, bytestring >=0.10.8
94-
-- , case-insensitive >=1.2
95-
-- , conduit >=1.3
96-
-- , cryptonite >=0.25
97-
-- , directory >=1.2
98-
-- , hashable >=1.2
94+
, transformers >=0.2
95+
, ini >=0.3.5
96+
, time >=1.9
97+
, directory >=1.2
98+
, conduit >=1.3
9999
, http-client >=0.5 && <0.8
100-
-- , http-conduit >=2.3 && <3
101-
-- , http-types >=0.12
102-
-- , regex-posix >=0.96
103-
-- , resourcet >=1.1
104-
-- , retry >=0.7.6.2
100+
, http-conduit >=2.3 && <3
101+
, http-types >=0.12
102+
, resourcet >=1.1
103+
, retry >=0.7.6.2

0 commit comments

Comments
 (0)