Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ on:
jobs:
build-test:
if: github.repository == 'apache/pekko-http-quickstart-java.g8'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Setup Java 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17

- name: Cache Coursier cache
uses: coursier/cache-action@v6
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7

- name: sbt test
run: sbt test
Expand All @@ -37,20 +37,23 @@ jobs:

build-docs:
if: github.repository == 'apache/pekko-http-quickstart-java.g8'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Setup Java 11
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 11

- name: Install sbt
uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13

- name: Cache Coursier cache
uses: coursier/cache-action@v6
uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7

- name: sbt & Paradox
run: sbt test docs/paradox
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.4
sbt.version=1.11.6
4 changes: 2 additions & 2 deletions src/main/g8/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
def versions = [
PekkoVersion: "$pekko_version$",
PekkoHttpVersion: "$pekko_http_version$",
ScalaBinary: "2.13"
ScalaBinary: "3"
]
dependencies {
implementation platform("org.apache.pekko:pekko-http-bom_\${versions.ScalaBinary}:\${versions.PekkoHttpVersion}")
Expand All @@ -19,7 +19,7 @@ dependencies {
implementation "org.apache.pekko:pekko-http-jackson_\${versions.ScalaBinary}"
implementation "org.apache.pekko:pekko-actor-typed_\${versions.ScalaBinary}:\${versions.PekkoVersion}"
implementation "org.apache.pekko:pekko-stream_\${versions.ScalaBinary}:\${versions.PekkoVersion}"
implementation 'ch.qos.logback:logback-classic:1.3.14'
implementation 'ch.qos.logback:logback-classic:1.3.15'
testImplementation "org.apache.pekko:pekko-http-testkit_\${versions.ScalaBinary}"
testImplementation "org.apache.pekko:pekko-actor-testkit-typed_\${versions.ScalaBinary}:\${versions.PekkoVersion}"
testImplementation 'junit:junit:4.13.2'
Expand Down
4 changes: 2 additions & 2 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ lazy val root = (project in file(".")).
settings(
inThisBuild(List(
organization := "$organization$",
scalaVersion := "2.13.14",
scalaVersion := "3.3.6",
name := "$name$"
)),
name := "TestProject",
Expand All @@ -14,7 +14,7 @@ lazy val root = (project in file(".")).
"org.apache.pekko" %% "pekko-actor-typed" % pekkoVersion,
"org.apache.pekko" %% "pekko-stream" % pekkoVersion,
"org.apache.pekko" %% "pekko-http-jackson" % pekkoHttpVersion,
"ch.qos.logback" % "logback-classic" % "1.3.14",
"ch.qos.logback" % "logback-classic" % "1.3.15",

"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
Expand Down
4 changes: 2 additions & 2 deletions src/main/g8/default.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name=My Pekko HTTP Project
pekko_http_version=1.1.0
pekko_version=1.1.2
pekko_http_version=1.2.0
pekko_version=1.2.0
organization=com.example
package=$organization$
verbatim=gradlew gradlew.bat gradle-wrapper.properties gradle-wrapper.jar
4 changes: 2 additions & 2 deletions src/main/g8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<properties>
<pekko.version>$pekko_version$</pekko.version>
<pekko.http.version>$pekko_http_version$</pekko.http.version>
<scala.binary.version>2.13</scala.binary.version>
<scala.binary.version>3</scala.binary.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
</dependency>
<dependency>
<groupId>org.apache.pekko</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.11.6