Skip to content

Commit

Permalink
Update finagle-thrift, scrooge-core, ... to 22.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@bpholt
dwolla-oss-scala-steward[bot] authored and bpholt committed Mar 14, 2024
1 parent ebfdd01 commit c33ca2f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,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 core/target/js-2.12 scala-futures/target/jvm-2.12 twitter-futures/target/twitter-22.4.0-jvm-2.12 .finagle-tagless-scalafix-latest/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.12 scalafix/rules/target/twitter-22.7.0-jvm-2.12 twitter-futures/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.13 scala-futures/target/jvm-2.13 .finagle-tagless-scalafix-latest/target/twitter-22.7.0-jvm-2.13 .async-utils-finagle-latest/target/twitter-22.7.0-jvm-2.12 core/target/jvm-2.13 .async-utils-twitter-latest/target/twitter-22.7.0-jvm-2.12 finagle-natchez/target/twitter-22.7.0-jvm-2.13 .async-utils-finagle-latest/target/twitter-22.7.0-jvm-2.13 twitter-finagle/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.4.0-jvm-2.13 .async-utils-twitter-latest/target/twitter-22.7.0-jvm-2.13 scala-futures/target/js-2.12 finagle-natchez/target/twitter-22.4.0-jvm-2.12 twitter-finagle/target/twitter-22.7.0-jvm-2.12 twitter-finagle/target/twitter-22.4.0-jvm-2.12 finagle-natchez/target/twitter-22.7.0-jvm-2.12 core/target/jvm-2.12 finagle-natchez/target/twitter-22.4.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.7.0-jvm-2.13 scala-futures/target/js-2.13 twitter-finagle/target/twitter-22.4.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.7.0-jvm-2.13 core/target/js-2.13 project/target
run: mkdir -p core/target/js-2.12 scala-futures/target/jvm-2.12 .finagle-tagless-scalafix-latest/target/twitter-22.12.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.12.0-jvm-2.12 finagle-natchez/target/twitter-22.12.0-jvm-2.13 scalafix/rules/target/twitter-22.12.0-jvm-2.12 twitter-finagle/target/twitter-22.12.0-jvm-2.12 twitter-futures/target/twitter-22.4.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.12 .async-utils-finagle-latest/target/twitter-22.12.0-jvm-2.12 finagle-natchez/target/twitter-22.12.0-jvm-2.12 scalafix/rules/target/twitter-22.7.0-jvm-2.12 twitter-futures/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.13 scala-futures/target/jvm-2.13 twitter-futures/target/twitter-22.12.0-jvm-2.12 core/target/jvm-2.13 finagle-natchez/target/twitter-22.7.0-jvm-2.13 .async-utils-twitter-latest/target/twitter-22.12.0-jvm-2.13 twitter-futures/target/twitter-22.12.0-jvm-2.13 twitter-finagle/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.4.0-jvm-2.13 scala-futures/target/js-2.12 finagle-natchez/target/twitter-22.4.0-jvm-2.12 twitter-finagle/target/twitter-22.7.0-jvm-2.12 twitter-finagle/target/twitter-22.4.0-jvm-2.12 finagle-natchez/target/twitter-22.7.0-jvm-2.12 core/target/jvm-2.12 .finagle-tagless-scalafix-latest/target/twitter-22.12.0-jvm-2.12 scalafix/rules/target/twitter-22.12.0-jvm-2.13 finagle-natchez/target/twitter-22.4.0-jvm-2.13 scala-futures/target/js-2.13 twitter-finagle/target/twitter-22.4.0-jvm-2.13 twitter-finagle/target/twitter-22.12.0-jvm-2.13 scalafix/rules/target/twitter-22.7.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.12.0-jvm-2.13 .async-utils-finagle-latest/target/twitter-22.12.0-jvm-2.13 .async-utils-twitter-latest/target/twitter-22.12.0-jvm-2.12 core/target/js-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 core/target/js-2.12 scala-futures/target/jvm-2.12 twitter-futures/target/twitter-22.4.0-jvm-2.12 .finagle-tagless-scalafix-latest/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.12 scalafix/rules/target/twitter-22.7.0-jvm-2.12 twitter-futures/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.13 scala-futures/target/jvm-2.13 .finagle-tagless-scalafix-latest/target/twitter-22.7.0-jvm-2.13 .async-utils-finagle-latest/target/twitter-22.7.0-jvm-2.12 core/target/jvm-2.13 .async-utils-twitter-latest/target/twitter-22.7.0-jvm-2.12 finagle-natchez/target/twitter-22.7.0-jvm-2.13 .async-utils-finagle-latest/target/twitter-22.7.0-jvm-2.13 twitter-finagle/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.4.0-jvm-2.13 .async-utils-twitter-latest/target/twitter-22.7.0-jvm-2.13 scala-futures/target/js-2.12 finagle-natchez/target/twitter-22.4.0-jvm-2.12 twitter-finagle/target/twitter-22.7.0-jvm-2.12 twitter-finagle/target/twitter-22.4.0-jvm-2.12 finagle-natchez/target/twitter-22.7.0-jvm-2.12 core/target/jvm-2.12 finagle-natchez/target/twitter-22.4.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.7.0-jvm-2.13 scala-futures/target/js-2.13 twitter-finagle/target/twitter-22.4.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.7.0-jvm-2.13 core/target/js-2.13 project/target
run: tar cf targets.tar core/target/js-2.12 scala-futures/target/jvm-2.12 .finagle-tagless-scalafix-latest/target/twitter-22.12.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.12.0-jvm-2.12 finagle-natchez/target/twitter-22.12.0-jvm-2.13 scalafix/rules/target/twitter-22.12.0-jvm-2.12 twitter-finagle/target/twitter-22.12.0-jvm-2.12 twitter-futures/target/twitter-22.4.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.12 .async-utils-finagle-latest/target/twitter-22.12.0-jvm-2.12 finagle-natchez/target/twitter-22.12.0-jvm-2.12 scalafix/rules/target/twitter-22.7.0-jvm-2.12 twitter-futures/target/twitter-22.7.0-jvm-2.12 scalafix/rules/target/twitter-22.4.0-jvm-2.13 scala-futures/target/jvm-2.13 twitter-futures/target/twitter-22.12.0-jvm-2.12 core/target/jvm-2.13 finagle-natchez/target/twitter-22.7.0-jvm-2.13 .async-utils-twitter-latest/target/twitter-22.12.0-jvm-2.13 twitter-futures/target/twitter-22.12.0-jvm-2.13 twitter-finagle/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.7.0-jvm-2.13 twitter-futures/target/twitter-22.4.0-jvm-2.13 scala-futures/target/js-2.12 finagle-natchez/target/twitter-22.4.0-jvm-2.12 twitter-finagle/target/twitter-22.7.0-jvm-2.12 twitter-finagle/target/twitter-22.4.0-jvm-2.12 finagle-natchez/target/twitter-22.7.0-jvm-2.12 core/target/jvm-2.12 .finagle-tagless-scalafix-latest/target/twitter-22.12.0-jvm-2.12 scalafix/rules/target/twitter-22.12.0-jvm-2.13 finagle-natchez/target/twitter-22.4.0-jvm-2.13 scala-futures/target/js-2.13 twitter-finagle/target/twitter-22.4.0-jvm-2.13 twitter-finagle/target/twitter-22.12.0-jvm-2.13 scalafix/rules/target/twitter-22.7.0-jvm-2.13 .async-utils-finagle-natchez-latest/target/twitter-22.12.0-jvm-2.13 .async-utils-finagle-latest/target/twitter-22.12.0-jvm-2.13 .async-utils-twitter-latest/target/twitter-22.12.0-jvm-2.12 core/target/js-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
21 changes: 16 additions & 5 deletions project/AsyncUtilsBuildPlugin.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
.flatMap(_.componentProjects)
}

private val currentTwitterVersion = Version("22.7.0").get
private val currentTwitterVersion = Version("22.12.0").get

// When a new version is released, move what was previously the current version into the list of old versions.
// This plugin will automatically release a new suffixed artifact that can be used by users with bincompat issues.
// Don't forget to regenerate the GitHub Actions workflow by running the `githubWorkflowGenerate` sbt task.
private val oldVersions = List(
"22.7.0",
"22.4.0",
)
.flatMap(Version(_))
Expand Down Expand Up @@ -151,6 +152,16 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
)
.dependsOn(`async-utils`)

private def pickTlVersionIntroduced(v: Version): Setting[Map[String, String]] =
tlVersionIntroduced := {
v match {
case Version(22, 12, Some(0), None) =>
Map("2.12" -> "1.2.0", "2.13" -> "1.2.0")
case v if v <= Version(22, 7, Some(0), None) =>
Map("2.12" -> "1.1.0", "2.13" -> "1.1.0")
}
}

private lazy val `async-utils-twitter` =
projectMatrixForSupportedTwitterVersions("async-utils-twitter", "twitter-futures") { v =>
List(
Expand All @@ -162,7 +173,7 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
) ++ (if (scalaVersion.value.startsWith("2")) scala2CompilerPlugins else Nil)
},
mimaPreviousArtifacts += organizationName.value %% name.value % "0.3.0",
tlVersionIntroduced := Map("2.12" -> "1.1.0", "2.13" -> "1.1.0"),
pickTlVersionIntroduced(v),
)
}
.dependsOn(`async-utils-core`)
Expand All @@ -177,7 +188,7 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
) ++ (if (scalaVersion.value.startsWith("2")) scala2CompilerPlugins else Nil)
},
mimaPreviousArtifacts += organizationName.value %% name.value % "0.3.0",
tlVersionIntroduced := Map("2.12" -> "1.1.0", "2.13" -> "1.1.0"),
pickTlVersionIntroduced(v),
)
}
.dependsOn(`async-utils-twitter`)
Expand All @@ -196,7 +207,7 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
) ++ (if (scalaVersion.value.startsWith("2")) scala2CompilerPlugins else Nil)
},
mimaPreviousArtifacts += organizationName.value %% name.value % "0.3.0",
tlVersionIntroduced := Map("2.12" -> "1.1.0", "2.13" -> "1.1.0"),
pickTlVersionIntroduced(v),
)
}
.dependsOn(`async-utils-finagle`)
Expand All @@ -214,7 +225,7 @@ object AsyncUtilsBuildPlugin extends AutoPlugin {
_.filterNot(_ == "-Xfatal-warnings")
},
mimaPreviousArtifacts += organizationName.value %% name.value % "0.3.0",
tlVersionIntroduced := Map("2.12" -> "1.1.0", "2.13" -> "1.1.0"),
pickTlVersionIntroduced(v),
)
}

Expand Down

0 comments on commit c33ca2f

Please sign in to comment.