diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe6589d..3970de4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/project/build.properties b/project/build.properties index 09feeee..5e6884d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.4 +sbt.version=1.11.6 diff --git a/src/main/g8/build.gradle b/src/main/g8/build.gradle index 4419582..346f2ec 100644 --- a/src/main/g8/build.gradle +++ b/src/main/g8/build.gradle @@ -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}") @@ -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' diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 48e278c..eb456bc 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -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", @@ -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, diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 5c7bba9..b6cc7e1 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -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 \ No newline at end of file diff --git a/src/main/g8/pom.xml b/src/main/g8/pom.xml index c305b02..ec52d93 100644 --- a/src/main/g8/pom.xml +++ b/src/main/g8/pom.xml @@ -9,7 +9,7 @@ $pekko_version$ $pekko_http_version$ - 2.13 + 3 UTF-8 @@ -47,7 +47,7 @@ ch.qos.logback logback-classic - 1.3.14 + 1.3.15 org.apache.pekko diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 081fdbb..5e6884d 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.11.6