Skip to content
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.

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

Smithy4s Kinesis Client #36

Merged
merged 32 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3924f80
Update to ProjectMatrix
etspaceman Feb 5, 2023
98db831
Add crossScalaVersions
etspaceman Feb 5, 2023
7644a51
Add scalacOptions manually, generate workflows
etspaceman Feb 5, 2023
3829370
Merge remote-tracking branch 'origin/main' into smithy4sclient
etspaceman Feb 6, 2023
50576b9
Fix scalaVersion derivation
etspaceman Feb 6, 2023
2361949
Cleanup PR
etspaceman Feb 6, 2023
3cb8201
Clean up build
etspaceman Feb 6, 2023
cddb952
Delete ci.yml
etspaceman Feb 6, 2023
a50981b
Delete clean.yml
etspaceman Feb 6, 2023
66d97da
Ignore .sbt files
etspaceman Feb 6, 2023
cc11871
Fix class name
etspaceman Feb 6, 2023
120aeca
Workaround for kinesis-mock bugs, fixed localstack integration
etspaceman Feb 6, 2023
7e8722f
Note, bump memory
etspaceman Feb 6, 2023
c6652a0
Scaladoc
etspaceman Feb 7, 2023
1aaf41a
NoOpLogger default, markdowns
etspaceman Feb 7, 2023
7600912
Merge remote-tracking branch 'origin/main' into smithy4sclient
etspaceman Feb 10, 2023
635a7f9
Updates
etspaceman Feb 10, 2023
5f8385f
Better pretty rules
etspaceman Feb 10, 2023
2122036
Merge remote-tracking branch 'origin/main' into smithy4sclient
etspaceman Feb 10, 2023
4431a22
WIP on using kinesis spec with transformers
etspaceman Feb 10, 2023
fb4cdfe
Cleanup
etspaceman Feb 10, 2023
2d56736
More cleanup
etspaceman Feb 10, 2023
d200414
Merge remote-tracking branch 'origin/main' into smithy4sclient
etspaceman Feb 11, 2023
71d7199
Fixes
etspaceman Feb 11, 2023
9f0721a
Remove scala 2.12, project matrix
etspaceman Feb 11, 2023
315a933
Mergify plugin
etspaceman Feb 11, 2023
3714d04
fix build for some reason
etspaceman Feb 11, 2023
d244cb5
Remove scoverage, bring back scala 2.12/matrix
etspaceman Feb 12, 2023
94cbdd5
Fix for mergify labels
etspaceman Feb 12, 2023
4493101
Fixes
etspaceman Feb 12, 2023
a052373
remove compat dep
etspaceman Feb 12, 2023
4041601
Fix mima
etspaceman Feb 12, 2023
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
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10, 2.12.17, 3.2.2]
scala: [2.12.17, 3.2.2, 2.13.10]
java: [temurin@17]
project: [rootJVM]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -100,11 +100,11 @@ jobs:

- name: Make target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: mkdir -p target shared/target kpl-ciris/target unidocs/target .js/target site/target kpl-tests/target kcl-localstack/target kpl/target kcl-logging-circe/target kcl-tests/target kcl-ciris/target kinesis-client-logging-circe/target shared-circe/target kpl-logging-circe/target kinesis-client/target .jvm/target kcl/target kpl-localstack/target .native/target kinesis-client-tests/target kcl-fs2/target shared-localstack/target aws-v1-localstack/target kinesis-client-localstack/target aws-v2-localstack/target shared-ciris/target kcl-http4s/target kcl-fs2-ciris/target compat/target project/target
run: mkdir -p smithy4s-client-tests/target/jvm-2.13 shared-ciris/target/jvm-3 aws-v1-localstack/target/jvm-2.12 kpl/target/jvm-3 target shared/target/jvm-2.13 kpl/target/jvm-2.12 kcl-ciris/target/jvm-3 kpl-ciris/target/jvm-2.13 kinesis-client-tests/target/jvm-2.12 kpl-ciris/target/jvm-2.12 smithy4s-client-localstack/target/jvm-3 smithy4s-client/target/jvm-3 unidocs/target/jvm-2.13 smithy4s-client-logging-circe/target/jvm-2.13 kcl-logging-circe/target/jvm-3 .js/target kcl-fs2-ciris/target/jvm-2.12 kinesis-client-logging-circe/target/jvm-3 aws-v1-localstack/target/jvm-3 kcl-tests/target/jvm-2.12 site/target/jvm-2.13 kinesis-client-localstack/target/jvm-3 shared/target/jvm-3 kpl-tests/target/jvm-2.13 kcl-localstack/target/jvm-2.13 kcl-fs2-ciris/target/jvm-3 kcl/target/jvm-3 kcl/target/jvm-2.12 unidocs/target/jvm-2.12 kpl-tests/target/jvm-3 shared-ciris/target/jvm-2.12 shared-localstack/target/jvm-2.12 kpl-tests/target/jvm-2.12 kcl-localstack/target/jvm-2.12 kpl/target/jvm-2.13 shared-circe/target/jvm-2.12 kcl-logging-circe/target/jvm-2.13 kinesis-client-tests/target/jvm-3 kcl-tests/target/jvm-2.13 kcl-ciris/target/jvm-2.13 kinesis-client-logging-circe/target/jvm-2.13 unidocs/target/jvm-3 compat/target/jvm-3 kinesis-client-logging-circe/target/jvm-2.12 shared-circe/target/jvm-2.13 kinesis-client/target/jvm-2.12 kpl-logging-circe/target/jvm-2.13 kcl-tests/target/jvm-3 aws-v2-localstack/target/jvm-3 kcl-http4s/target/jvm-2.12 aws-v2-localstack/target/jvm-2.12 kcl-logging-circe/target/jvm-2.12 kinesis-client/target/jvm-2.13 .jvm/target kcl/target/jvm-2.13 kpl-localstack/target/jvm-3 kpl-localstack/target/jvm-2.13 kcl-ciris/target/jvm-2.12 .native/target kinesis-client-tests/target/jvm-2.13 kcl-fs2/target/jvm-2.13 kcl-localstack/target/jvm-3 kcl-fs2/target/jvm-2.12 kinesis-client/target/jvm-3 shared-localstack/target/jvm-2.13 aws-v1-localstack/target/jvm-2.13 kinesis-client-localstack/target/jvm-2.13 kpl-logging-circe/target/jvm-3 smithy4s-client-localstack/target/jvm-2.13 aws-v2-localstack/target/jvm-2.13 kpl-logging-circe/target/jvm-2.12 kcl-fs2/target/jvm-3 shared/target/jvm-2.12 smithy4s-client-tests/target/jvm-3 shared-circe/target/jvm-3 shared-ciris/target/jvm-2.13 shared-localstack/target/jvm-3 compat/target/jvm-2.12 kpl-ciris/target/jvm-3 smithy4s-client/target/jvm-2.13 kpl-localstack/target/jvm-2.12 smithy4s-client-logging-circe/target/jvm-3 kcl-http4s/target/jvm-2.13 kinesis-client-localstack/target/jvm-2.12 kcl-fs2-ciris/target/jvm-2.13 kcl-http4s/target/jvm-3 compat/target/jvm-2.13 project/target

- name: Compress target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: tar cf targets.tar target shared/target kpl-ciris/target unidocs/target .js/target site/target kpl-tests/target kcl-localstack/target kpl/target kcl-logging-circe/target kcl-tests/target kcl-ciris/target kinesis-client-logging-circe/target shared-circe/target kpl-logging-circe/target kinesis-client/target .jvm/target kcl/target kpl-localstack/target .native/target kinesis-client-tests/target kcl-fs2/target shared-localstack/target aws-v1-localstack/target kinesis-client-localstack/target aws-v2-localstack/target shared-ciris/target kcl-http4s/target kcl-fs2-ciris/target compat/target project/target
run: tar cf targets.tar smithy4s-client-tests/target/jvm-2.13 shared-ciris/target/jvm-3 aws-v1-localstack/target/jvm-2.12 kpl/target/jvm-3 target shared/target/jvm-2.13 kpl/target/jvm-2.12 kcl-ciris/target/jvm-3 kpl-ciris/target/jvm-2.13 kinesis-client-tests/target/jvm-2.12 kpl-ciris/target/jvm-2.12 smithy4s-client-localstack/target/jvm-3 smithy4s-client/target/jvm-3 unidocs/target/jvm-2.13 smithy4s-client-logging-circe/target/jvm-2.13 kcl-logging-circe/target/jvm-3 .js/target kcl-fs2-ciris/target/jvm-2.12 kinesis-client-logging-circe/target/jvm-3 aws-v1-localstack/target/jvm-3 kcl-tests/target/jvm-2.12 site/target/jvm-2.13 kinesis-client-localstack/target/jvm-3 shared/target/jvm-3 kpl-tests/target/jvm-2.13 kcl-localstack/target/jvm-2.13 kcl-fs2-ciris/target/jvm-3 kcl/target/jvm-3 kcl/target/jvm-2.12 unidocs/target/jvm-2.12 kpl-tests/target/jvm-3 shared-ciris/target/jvm-2.12 shared-localstack/target/jvm-2.12 kpl-tests/target/jvm-2.12 kcl-localstack/target/jvm-2.12 kpl/target/jvm-2.13 shared-circe/target/jvm-2.12 kcl-logging-circe/target/jvm-2.13 kinesis-client-tests/target/jvm-3 kcl-tests/target/jvm-2.13 kcl-ciris/target/jvm-2.13 kinesis-client-logging-circe/target/jvm-2.13 unidocs/target/jvm-3 compat/target/jvm-3 kinesis-client-logging-circe/target/jvm-2.12 shared-circe/target/jvm-2.13 kinesis-client/target/jvm-2.12 kpl-logging-circe/target/jvm-2.13 kcl-tests/target/jvm-3 aws-v2-localstack/target/jvm-3 kcl-http4s/target/jvm-2.12 aws-v2-localstack/target/jvm-2.12 kcl-logging-circe/target/jvm-2.12 kinesis-client/target/jvm-2.13 .jvm/target kcl/target/jvm-2.13 kpl-localstack/target/jvm-3 kpl-localstack/target/jvm-2.13 kcl-ciris/target/jvm-2.12 .native/target kinesis-client-tests/target/jvm-2.13 kcl-fs2/target/jvm-2.13 kcl-localstack/target/jvm-3 kcl-fs2/target/jvm-2.12 kinesis-client/target/jvm-3 shared-localstack/target/jvm-2.13 aws-v1-localstack/target/jvm-2.13 kinesis-client-localstack/target/jvm-2.13 kpl-logging-circe/target/jvm-3 smithy4s-client-localstack/target/jvm-2.13 aws-v2-localstack/target/jvm-2.13 kpl-logging-circe/target/jvm-2.12 kcl-fs2/target/jvm-3 shared/target/jvm-2.12 smithy4s-client-tests/target/jvm-3 shared-circe/target/jvm-3 shared-ciris/target/jvm-2.13 shared-localstack/target/jvm-3 compat/target/jvm-2.12 kpl-ciris/target/jvm-3 smithy4s-client/target/jvm-2.13 kpl-localstack/target/jvm-2.12 smithy4s-client-logging-circe/target/jvm-3 kcl-http4s/target/jvm-2.13 kinesis-client-localstack/target/jvm-2.12 kcl-fs2-ciris/target/jvm-2.13 kcl-http4s/target/jvm-3 compat/target/jvm-2.13 project/target

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
Expand Down Expand Up @@ -157,32 +157,32 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.10, rootJVM)
- name: Download target directories (2.12.17, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM

- name: Inflate target directories (2.13.10, rootJVM)
- name: Inflate target directories (2.12.17, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.17, rootJVM)
- name: Download target directories (3.2.2, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM

- name: Inflate target directories (2.12.17, rootJVM)
- name: Inflate target directories (3.2.2, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.2.2, rootJVM)
- name: Download target directories (2.13.10, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM

- name: Inflate target directories (3.2.2, rootJVM)
- name: Inflate target directories (2.13.10, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
Expand Down Expand Up @@ -251,5 +251,5 @@ jobs:
uses: peaceiris/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: site/target/docs/site
publish_dir: site/target/jvm-2.13/docs/site
keep_files: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ docker/image/lib/*.jar
**/metals.sbt
.smithy.lsp.log
!/**/.gitkeep
.sbt/
3 changes: 2 additions & 1 deletion .jvmopts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-Xmx4G
-Xmx6G
-Xss4M
-XX:+UseG1GC
-XX:+UseStringDeduplication
12 changes: 1 addition & 11 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rules = [DisableSyntax, NoValInForComprehension, ProcedureSyntax, OrganizeImports]
rules = [DisableSyntax, NoValInForComprehension]
DisableSyntax {
noVars = true
noThrows = true
Expand All @@ -13,13 +13,3 @@ DisableSyntax {
noXml = true
noDefaultArgs = false
}

OrganizeImports {
groupedImports = Merge
groups = [
"scala.",
"java.",
"*",
"kinesis4cats"
]
}
29 changes: 28 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
version = 3.7.1
project.git = true
runner.dialect = scala213
runner.dialect = scala213Source3

rewrite.rules = [
RedundantBraces,
RedundantParens,
PreferCurlyFors,
Imports
]

rewrite {
imports {
groups = [
["scala\\..*"],
["java\\..*"],
[".*"],
["kinesis4cats\\..*"],
]
sort = ascii
}
}
fileOverride {
"glob:**.sbt" {
runner.dialect = scala212
}
"glob:**/project/**" {
runner.dialect = scala212
}
}
Loading