-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Apply minor patches to ease onboarding to Pekko
- Loading branch information
1 parent
14ac09d
commit 8299032
Showing
29 changed files
with
123 additions
and
76 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 |
---|---|---|
|
@@ -2,6 +2,10 @@ name: Standard Workflow | |
|
||
on: workflow_call | ||
|
||
concurrency: | ||
group: ${{ github.head_ref }} | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
code-style-check: | ||
runs-on: ubuntu-latest | ||
|
@@ -15,9 +19,6 @@ jobs: | |
with: | ||
java-version: [email protected] | ||
|
||
- name: Resolve dependencies | ||
run: sbt update | ||
|
||
- name: Run code checks | ||
run: | | ||
PATH=$PATH:./scripts | ||
|
@@ -33,6 +34,9 @@ jobs: | |
# Curiously, scalafmtCheckAll doesn't cover *.sbt files, hence scalafmtSbtCheck is needed as well | ||
run: sbt scalafmtCheckAll scalafmtSbtCheck "scalafixAll --check" | ||
|
||
- name: Substitute sbt plugin snapshot version | ||
run: ./scripts/substitute-sbt-plugin-snapshot-version | ||
|
||
- name: Check code style - examples/event-migration | ||
run: sbt scalafmtCheckAll scalafmtSbtCheck "scalafixAll --check" | ||
working-directory: examples/event-migration | ||
|
@@ -57,9 +61,6 @@ jobs: | |
with: | ||
java-version: [email protected] | ||
|
||
- name: Resolve dependencies | ||
run: sbt update | ||
|
||
- name: Compile | ||
run: sbt compile Test/compile | ||
|
||
|
@@ -84,9 +85,6 @@ jobs: | |
with: | ||
java-version: [email protected] | ||
|
||
- name: Resolve dependencies | ||
run: sbt update | ||
|
||
- name: Compile | ||
run: sbt compile Test/compile | ||
|
||
|
@@ -110,9 +108,6 @@ jobs: | |
with: | ||
java-version: [email protected] | ||
|
||
- name: Resolve dependencies | ||
run: sbt update | ||
|
||
- name: Compile | ||
run: sbt compile Test/compile | ||
|
||
|
@@ -151,6 +146,9 @@ jobs: | |
with: | ||
java-version: [email protected] | ||
|
||
- name: Substitute sbt plugin snapshot version | ||
run: ./scripts/substitute-sbt-plugin-snapshot-version | ||
|
||
- name: Test event-migration-examples | ||
run: sbt test | ||
working-directory: examples/event-migration | ||
|
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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
plugins: | ||
lint-no-dead-urls: | ||
skipUrlPatterns: | ||
# TODO (#325): remove these patterns | ||
- https://github.com/VirtusLab/pekko-serialization-helper |
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 |
---|---|---|
|
@@ -36,7 +36,11 @@ ThisBuild / licenses := List( | |
"MIT License" -> url("https://github.com/VirtusLab/akka-serialization-helper/blob/main/LICENSE")) | ||
ThisBuild / developers := List( | ||
Developer("MarconZet", "Marcin Złakowski", "[email protected]", url("https://github.com/MarconZet")), | ||
Developer("HubertBalcerzak", "Hubert Balcerzak", "[email protected]", url("https://github.com/HubertBalcerzak")), | ||
Developer( | ||
"LukaszKontowski", | ||
"Łukasz Kontowski", | ||
"[email protected]", | ||
url("https://github.com/LukaszKontowski")), | ||
Developer("PawelLipski", "Paweł Lipski", "[email protected]", url("https://github.com/PawelLipski"))) | ||
|
||
sonatypeProfileName := "org.virtuslab" | ||
|
@@ -45,7 +49,8 @@ Global / onChangedBuildSource := ReloadOnSourceChanges | |
|
||
ThisBuild / semanticdbEnabled := true | ||
ThisBuild / semanticdbVersion := "4.7.8" | ||
ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0" | ||
|
||
ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo | ||
|
||
lazy val commonSettings = Seq( | ||
sonatypeProfileName := "org.virtuslab", | ||
|
@@ -148,6 +153,7 @@ lazy val serializabilityCheckerCompilerPlugin = (projectMatrix in file("serializ | |
.settings(name := "serializability-checker-compiler-plugin") | ||
.settings(commonSettings) | ||
.settings(crossScalaVersions := testAgainstScalaVersions) | ||
.settings(resolvers ++= Resolver.sonatypeOssRepos("snapshots")) | ||
.settings( | ||
libraryDependencies ++= { | ||
CrossVersion | ||
|
@@ -165,7 +171,7 @@ lazy val serializabilityCheckerCompilerPlugin = (projectMatrix in file("serializ | |
akkaProjections % Test, | ||
betterFiles % Test, | ||
akkaGrpc % Test, | ||
akkaGrpcWebSupport % Test)) | ||
akkaHttpCors % Test)) | ||
.dependsOn(annotation) | ||
.jvmPlatform(scalaVersions = targetScalaVersions) | ||
|
||
|
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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 |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -e -o pipefail -u | ||
|
||
git ls-files | grep -Ev 'akka-to-pekko|scalafmt\.conf|scala-steward\.conf' | xargs sed -E -f akka-to-pekko.sed -i | ||
|
||
echo 'libraryDependencySchemes += "org.apache.pekko" %% "pekko-http-core" % "always"' >> examples/akka-persistence-app/build.sbt | ||
|
||
git ls-files | grep -v 'akka-to-pekko' | rename -e 's/akka/pekko/' -e 's/Akka/Pekko/' --make-dirs --stdin |
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 |
---|---|---|
@@ -0,0 +1,17 @@ | ||
s/"akka\./"org.apache.pekko./ | ||
s/doc\.akka\.io/pekko.apache.org/g | ||
s/com\.lightbend\.akka(\.\w+)?/org.apache.pekko/ | ||
s/com\.typesafe\.akka/org.apache.pekko/g | ||
s/import akka/import org.apache.pekko/ | ||
s/akka/pekko/g | ||
s/Akka/Pekko/g | ||
|
||
s/"ch.megard" %% "pekko-http-cors" % ".*"/"ch.megard" %% "pekko-http-cors" % "0.0.0-SNAPSHOT"/ | ||
s/"org.apache.pekko" %% "pekko-grpc-runtime" % ".*"/"org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.0-RC2-2-56662643-SNAPSHOT"/ | ||
s/"org.apache.pekko" % "sbt-pekko-grpc" % ".*"/"org.apache.pekko" % "sbt-pekko-grpc" % "0.0.0-94-0bfb43a6-SNAPSHOT"/ | ||
s/val pekkoHttp2SupportVersion = .*/val pekkoHttp2SupportVersion = "0.0.0+4272-045c925b-SNAPSHOT"/ | ||
s/val pekkoHttpVersion = .*/val pekkoHttpVersion = "1.0.0"/ | ||
s/val pekkoManagementVersion = .*/val pekkoManagementVersion = "1.0.0"/ | ||
s/val pekkoPersistenceJdbcVersion = .*/val pekkoPersistenceJdbcVersion = "0.0.0+998-6a9e5841-SNAPSHOT"/ | ||
s/val pekkoProjectionVersion = .*/val pekkoProjectionVersion = "0.0.0+68-6f80a745-SNAPSHOT"/ | ||
s/val pekkoVersion = .*/val pekkoVersion = "1.0.1"/ |
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 |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -e -o pipefail -u | ||
|
||
sbt publishLocal | ||
|
||
version=$(ls -1t ~/.ivy2/local/org.virtuslab.ash/sbt-akka-serialization-helper/scala_2.12/sbt_1.0/ | head -1) | ||
# Version can be more elegantly extracted using: | ||
# sbt -Dsbt.supershell=false -error "print sbtPekkoSerializationHelper/version" | ||
# but the problem is that snapshot versions include minute-resolution timestamp, | ||
# which is likely to change from the preceding `sbt publishLocal`. | ||
|
||
find . -type f | grep '\.sbt$' | xargs sed -E 's/("sbt-akka-serialization-helper") % ".*"/\1 % "'"$version"'"/' -i |
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
Oops, something went wrong.