-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #135 from Dwolla/updates
update to cats-effect 3, and strip out the features we're leaving behind
- Loading branch information
Showing
45 changed files
with
83 additions
and
2,138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,9 +9,9 @@ name: Continuous Integration | |
|
|
||
| on: | ||
| pull_request: | ||
| branches: ['*'] | ||
| branches: ['**'] | ||
| push: | ||
| branches: ['*'] | ||
| branches: ['**'] | ||
| tags: [v*] | ||
|
|
||
| env: | ||
|
|
@@ -23,7 +23,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [2.13.6, 2.12.15] | ||
| scala: [2.13.7, 2.12.15] | ||
| java: [[email protected], [email protected]] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
|
|
@@ -33,7 +33,7 @@ jobs: | |
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v13 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
|
|
@@ -52,11 +52,10 @@ jobs: | |
| - name: Check that workflows are up to date | ||
| run: sbt ++${{ matrix.scala }} githubWorkflowCheck | ||
|
|
||
| - name: Build project | ||
| run: sbt ++${{ matrix.scala }} test | ||
| - run: sbt ++${{ matrix.scala }} test doc | ||
|
|
||
| - name: Compress target directories | ||
| run: tar cf targets.tar core/js/target target main/target lambda-io-app/js/target aws-java-sdk2/target core/jvm/target test-kit/target lambda-io-app/jvm/target project/target | ||
| run: tar cf targets.tar target core/js/target core/jvm/target aws-java-sdk2/target project/target | ||
|
|
||
| - name: Upload target directories | ||
| uses: actions/upload-artifact@v2 | ||
|
|
@@ -71,7 +70,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [2.13.6] | ||
| scala: [2.13.7] | ||
| java: [[email protected]] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
|
|
@@ -81,7 +80,7 @@ jobs: | |
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v13 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
|
|
@@ -97,12 +96,12 @@ jobs: | |
| ~/Library/Caches/Coursier/v1 | ||
| key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} | ||
|
|
||
| - name: Download target directories (2.13.6) | ||
| - name: Download target directories (2.13.7) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }} | ||
| name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} | ||
|
|
||
| - name: Inflate target directories (2.13.6) | ||
| - name: Inflate target directories (2.13.7) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
|
|
@@ -122,4 +121,4 @@ jobs: | |
| PGP_SECRET: ${{ secrets.PGP_SECRET }} | ||
| SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} | ||
| SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} | ||
| run: sbt ++${{ matrix.scala }} ci-release | ||
| run: sbt ++${{ matrix.scala }} ci-release | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| queue_rules: | ||
| - name: default | ||
| conditions: | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.6, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.6, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.7, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.7, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.12.15, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.12.15, [email protected]) | ||
|
|
||
|
|
@@ -25,8 +25,8 @@ pull_request_rules: | |
| - name: merge scala-steward's PRs | ||
| conditions: | ||
| - author=scala-steward | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.6, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.6, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.7, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.7, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.12.15, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.12.15, [email protected]) | ||
| actions: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| lazy val primaryName = "fs2-aws" | ||
| lazy val specs2Version = "4.13.0" | ||
| lazy val fs2Version = "2.5.10" | ||
| lazy val fs2Version = "3.2.2" | ||
|
|
||
| inThisBuild(List( | ||
| organization := "com.dwolla", | ||
|
|
@@ -14,18 +13,12 @@ inThisBuild(List( | |
| url("https://dwolla.com") | ||
| ) | ||
| ), | ||
| crossScalaVersions := Seq("2.13.6", "2.12.15"), | ||
| crossScalaVersions := Seq("2.13.7", "2.12.15"), | ||
| scalaVersion := crossScalaVersions.value.head, | ||
| startYear := Option(2018), | ||
| libraryDependencies ++= { | ||
| Seq( | ||
| "co.fs2" %%% "fs2-core" % fs2Version, | ||
| "org.specs2" %%% "specs2-core" % specs2Version % Test, | ||
| "org.specs2" %%% "specs2-cats" % "4.12.1" % Test, | ||
| ) | ||
| }, | ||
| resolvers += Resolver.sonatypeRepo("releases"), | ||
|
|
||
| githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "doc"))), | ||
| githubWorkflowJavaVersions := Seq("[email protected]", "[email protected]"), | ||
| githubWorkflowTargetTags ++= Seq("v*"), | ||
| githubWorkflowPublishTargetBranches := | ||
|
|
@@ -68,32 +61,16 @@ lazy val fs2Utils = crossProject(JSPlatform, JVMPlatform) | |
| .settings( | ||
| name := "fs2-utils", | ||
| description := "Helpful utility functions for fs2 streams", | ||
| libraryDependencies ++= Seq( | ||
| "co.fs2" %%% "fs2-core" % fs2Version, | ||
| "org.scalameta" %%% "munit" % "0.7.29" % Test, | ||
| "com.eed3si9n.expecty" %%% "expecty" % "0.15.4" % Test, | ||
| "org.typelevel" %%% "munit-cats-effect-3" % "1.0.6" % Test, | ||
| ) | ||
| ) | ||
|
|
||
| lazy val fs2UtilsJVM = fs2Utils.jvm | ||
|
|
||
| lazy val fs2AwsUtils = (project in file("main")) | ||
| .settings(compilerOptions: _*) | ||
| .settings( | ||
| name := primaryName, | ||
| description := "Utility classes for interacting with the AWS SDKs from Scala using fs2", | ||
| libraryDependencies ++= { | ||
| val awsSdkVersion = "1.12.116" | ||
|
|
||
| Seq( | ||
| "co.fs2" %% "fs2-io" % fs2Version, | ||
| "com.chuusai" %% "shapeless" % "2.3.7", | ||
| "org.scala-lang.modules" %% "scala-collection-compat" % "2.6.0", | ||
| "com.amazonaws" % "aws-java-sdk-core" % awsSdkVersion, | ||
| "com.amazonaws" % "aws-java-sdk-kms" % awsSdkVersion % Provided, | ||
| "com.amazonaws" % "aws-java-sdk-cloudformation" % awsSdkVersion % Provided, | ||
| "com.amazonaws" % "aws-java-sdk-s3" % awsSdkVersion % Provided, | ||
| "org.specs2" %% "specs2-mock" % specs2Version % Test, | ||
| ) | ||
| }, | ||
| ) | ||
| .dependsOn(fs2UtilsJVM) | ||
|
|
||
| lazy val fs2Aws2Utils = (project in file("aws-java-sdk2")) | ||
| .settings(compilerOptions: _*) | ||
| .settings( | ||
|
|
@@ -103,63 +80,14 @@ lazy val fs2Aws2Utils = (project in file("aws-java-sdk2")) | |
| Seq( | ||
| "co.fs2" %% "fs2-reactive-streams" % fs2Version, | ||
| "org.typelevel" %% "cats-tagless-macros" % "0.14.0", | ||
| "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.1", | ||
| "org.scala-lang.modules" %% "scala-collection-compat" % "2.6.0", | ||
| "software.amazon.awssdk" % "kms" % "2.17.86" % Provided, | ||
| ) | ||
| }, | ||
| ) | ||
|
|
||
| lazy val lambdaIOApp = crossProject(JSPlatform, JVMPlatform) | ||
| .crossType(CrossType.Full) | ||
| .in(file("lambda-io-app")) | ||
| .settings(compilerOptions: _*) | ||
| .settings( | ||
| name := primaryName + "-lambda-io-app", | ||
| libraryDependencies ++= { | ||
| val circeVersion = "0.14.1" | ||
| Seq( | ||
| "io.circe" %%% "circe-literal" % circeVersion, | ||
| "io.circe" %%% "circe-generic-extras" % circeVersion, | ||
| "io.circe" %%% "circe-parser" % circeVersion, | ||
| "io.circe" %%% "circe-generic-extras" % circeVersion, | ||
| ) | ||
| }, | ||
| ) | ||
| .jvmSettings( | ||
| description := "IOApp for AWS Lambda Java runtime", | ||
| libraryDependencies ++= { | ||
| Seq( | ||
| "com.amazonaws" % "aws-lambda-java-core" % "1.2.1", | ||
| "com.amazonaws" % "aws-lambda-java-log4j2" % "1.2.0", | ||
| "co.fs2" %% "fs2-io" % fs2Version, | ||
| "org.typelevel" %% "log4cats-slf4j" % "1.3.1", | ||
| "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.14.1", | ||
| "org.apache.logging.log4j" % "log4j-api" % "2.14.1", | ||
| "org.typelevel" %% "cats-tagless-macros" % "0.14.0", | ||
| "org.tpolecat" %% "natchez-core" % "0.0.26", | ||
| "org.specs2" %% "specs2-scalacheck" % specs2Version, | ||
| ) | ||
| }, | ||
| ) | ||
| .jsSettings( | ||
| description := "IOApp for AWS Lambda Node runtime", | ||
| Compile / npmDependencies += ("@types/aws-lambda" -> "8.10.59"), | ||
| scalacOptions += "-Wconf:src=src_managed/.*:s", | ||
| stOutputPackage := "jsdep", | ||
| stMinimize := Selection.AllExcept("@types/aws-lambda"), | ||
| ) | ||
| .jsConfigure(_.enablePlugins(ScalablyTypedConverterGenSourcePlugin)) | ||
|
|
||
| lazy val fs2TestKit: Project = (project in file("test-kit")) | ||
| .settings(compilerOptions: _*) | ||
| .settings( | ||
| name := primaryName + "-testkit", | ||
| description := "Test implementations of fs2-aws classes", | ||
| ) | ||
| .dependsOn(fs2AwsUtils) | ||
|
|
||
| lazy val `fs2-aws` = (project in file(".")) | ||
| .settings( | ||
| publish / skip := true, | ||
| ) | ||
| .aggregate(fs2UtilsJVM, fs2Utils.js, fs2AwsUtils, fs2Aws2Utils, fs2TestKit, lambdaIOApp.jvm, lambdaIOApp.js) | ||
| .aggregate(fs2UtilsJVM, fs2Utils.js, fs2Aws2Utils) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.