From 82e8a0281132312759a8eb322078b6899e9a9084 Mon Sep 17 00:00:00 2001 From: xerial-bot Date: Wed, 14 Feb 2024 16:11:22 +0000 Subject: [PATCH 1/3] Update scala3-staging, ... to 3.3.2 --- airspec/build.sbt | 5 ++--- build.sbt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/airspec/build.sbt b/airspec/build.sbt index f195ce5e33..fb50943d0a 100644 --- a/airspec/build.sbt +++ b/airspec/build.sbt @@ -15,7 +15,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges val SCALA_2_12 = "2.12.18" val SCALA_2_13 = "2.13.12" -val SCALA_3 = "3.3.1" +val SCALA_3 = "3.3.2" val targetScalaVersions = SCALA_3 :: SCALA_2_13 :: SCALA_2_12 :: Nil val SCALACHECK_VERSION = "1.17.0" @@ -130,8 +130,7 @@ def excludePomDependency(excludes: Seq[String]) = { node: XmlNode => }).transform(node).head } -/** - * AirSpec build definitions. +/** AirSpec build definitions. * * To make AirSpec a standalone library without any cyclic project references, AirSpec embeds the source code of * airframe-log, di, surface, etc. diff --git a/build.sbt b/build.sbt index 77de9ec339..7317fe8f38 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import xerial.sbt.pack.PackPlugin.publishPackArchiveTgz val SCALA_2_12 = "2.12.18" val SCALA_2_13 = "2.13.12" -val SCALA_3 = "3.3.1" +val SCALA_3 = "3.3.2" val uptoScala2 = SCALA_2_13 :: SCALA_2_12 :: Nil val targetScalaVersions = SCALA_3 :: uptoScala2 From db144d3cb3ace543392014846f8898d77edfe4b7 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Wed, 14 Feb 2024 10:29:20 -0800 Subject: [PATCH 2/3] Update scala version in scripted tests --- .../src/main/scala/wvlet/airframe/http/client/SyncClient.scala | 2 +- .../src/sbt-test/sbt-airframe/generate-client/build.sbt | 2 +- sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt | 2 +- sbt-airframe/src/sbt-test/sbt-airframe/js-client/build.sbt | 2 +- sbt-airframe/src/sbt-test/sbt-airframe/openapi/build.sbt | 2 +- sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala b/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala index c40f2fd4af..81e14919a2 100644 --- a/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala +++ b/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala @@ -1,4 +1,4 @@ -/* +r/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/generate-client/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/generate-client/build.sbt index ad04ebfe87..b48f05b037 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/generate-client/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/generate-client/build.sbt @@ -5,7 +5,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-parse ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.2" lazy val root = project.aggregate(spi, server) diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt index 291a8eb6bf..454b00d516 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/grpc/build.sbt @@ -7,7 +7,7 @@ val buildSettings: Seq[Def.Setting[_]] = Seq( libraryDependencies += "org.wvlet.airframe" %% "airspec" % AIRSPEC_VERSION % Test ) ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.2" lazy val root = project diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/js-client/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/js-client/build.sbt index 91fa9df229..5b8b9f5399 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/js-client/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/js-client/build.sbt @@ -1,6 +1,6 @@ ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.2" lazy val root = project.aggregate(spi.js, client.js) diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/openapi/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/openapi/build.sbt index 0d8655eff4..1a18ab423c 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/openapi/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/openapi/build.sbt @@ -5,7 +5,7 @@ enablePlugins(AirframeHttpPlugin) name := "Open API Test" version := "1.0.0" -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.2" airframeHttpOpenAPIPackages := Seq("example.api") airframeHttpOpts := "-l debug" diff --git a/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt b/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt index 97a3bdbc83..c9df5b6b4e 100644 --- a/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt +++ b/sbt-airframe/src/sbt-test/sbt-airframe/rpc-netty/build.sbt @@ -12,7 +12,7 @@ val buildSettings: Seq[Def.Setting[_]] = Seq( libraryDependencies += "org.wvlet.airframe" %% "airspec" % AIRSPEC_VERSION % Test ) -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.2" lazy val root = project.aggregate(api, server) From 84c2f7bd5d3f3b165fa9292c0ed67375a0f5f34b Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Wed, 14 Feb 2024 10:33:54 -0800 Subject: [PATCH 3/3] fix --- .../src/main/scala/wvlet/airframe/http/client/SyncClient.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala b/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala index 81e14919a2..c40f2fd4af 100644 --- a/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala +++ b/airframe-http/src/main/scala/wvlet/airframe/http/client/SyncClient.scala @@ -1,4 +1,4 @@ -r/* +/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at