Skip to content
Open
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
4 changes: 2 additions & 2 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ License Version 2.0:
- opentelemetry-proto-1.3.2-alpha
- plexus-utils-3.5.1
- rocksdbjni-10.1.3
- scala-library-2.13.17
- scala-library-2.13.18
- scala-logging_2.13-3.9.6
- scala-reflect-2.13.17
- scala-reflect-2.13.18
- snappy-java-1.1.10.7
- snakeyaml-2.4
- swagger-annotations-2.2.39
Expand Down
2 changes: 1 addition & 1 deletion bin/kafka-run-class.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ should_include_file() {
base_dir=$(dirname $0)/..

if [ -z "$SCALA_VERSION" ]; then
SCALA_VERSION=2.13.17
SCALA_VERSION=2.13.18
if [[ -f "$base_dir/gradle.properties" ]]; then
SCALA_VERSION=`grep "^scalaVersion=" "$base_dir/gradle.properties" | cut -d= -f 2`
fi
Expand Down
2 changes: 1 addition & 1 deletion bin/windows/kafka-run-class.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set BASE_DIR=%CD%
popd

IF ["%SCALA_VERSION%"] EQU [""] (
set SCALA_VERSION=2.13.17
set SCALA_VERSION=2.13.18
)

IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
Expand Down
2 changes: 1 addition & 1 deletion checkstyle/.scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
version = 3.10.0
version = 3.10.2
runner.dialect = scala213
docstrings.style = Asterisk
docstrings.wrap = false
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ group=org.apache.kafka
# - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
# - streams/quickstart/java/pom.xml
version=4.3.0-SNAPSHOT
scalaVersion=2.13.17
scalaVersion=2.13.18
# Adding swaggerVersion in gradle.properties to have a single version in place for swagger
swaggerVersion=2.2.39
task=build
Expand Down
6 changes: 3 additions & 3 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ext {
}

// Add Scala version
def defaultScala213Version = '2.13.17'
def defaultScala213Version = '2.13.18'
if (hasProperty('scalaVersion')) {
if (scalaVersion == '2.13') {
versions["scala"] = defaultScala213Version
Expand Down Expand Up @@ -120,8 +120,8 @@ versions += [
// When updating the scalafmt version please also update the version field in checkstyle/.scalafmt.conf. scalafmt now
// has the version field as mandatory in its configuration, see
// https://github.com/scalameta/scalafmt/releases/tag/v3.1.0.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could update the link to https://github.com/scalameta/scalafmt/releases instead of specific version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanx for a sugestion @mingyen066 and lets try to decipher this together.

It seems that link for a ScalaFmt version 3.1.0 release notes was introduced as a comment at some point in order to explain why ScalaFmt requires two references for a same version in these two files:

  1. gradle/dependencies.gradle
  2. checkstyle/.scalafmt.conf

Thing is that this specific version (https://github.com/scalameta/scalafmt/releases/tag/v3.1.0) contains few changes related to version handling (and this is a directly related PR: https://github.com/scalameta/scalafmt/pull/2843 ScalafmtConfig: require version in a config file)

💡 Another option ➡️ directly related documentation link:
https://scalameta.org/scalafmt/docs/configuration.html#version

LMK which option sounds better for you:

  1. replace ScalaFmt release notes version 3.1.0 link with docs link (mentioned above) OR
  2. add docs link (in addition to ScalaFmt 3.1.0 link) OR
  3. leave as-is
image

scalafmt: "3.10.0",
scoverage: "2.4.0",
scalafmt: "3.10.2",
scoverage: "2.5.0",
slf4j: "1.7.36",
snappy: "1.1.10.7",
spotbugs: "4.9.8",
Expand Down