Skip to content

Commit

Permalink
add & upgrade to scala 2.13.15
Browse files Browse the repository at this point in the history
upgrade some dependencies
  • Loading branch information
tribbloid committed Oct 9, 2024
1 parent eb74e6c commit 01f37c0
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
max-parallel: 2
fail-fast: false
matrix:
scalaVersion: ["2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14"]
scalaVersion: ["2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14", "2.13.15"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
max-parallel: 2
fail-fast: false
matrix:
scalaVersion: ["2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14"]
scalaVersion: ["2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14", "2.13.15"]

continue-on-error: ${{ contains(needs.vars.outputs.experimentalScalaVersions, matrix.scalaVersion) }}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ allprojects {

val scalaTestV = "3.2.11"
testFixturesApi("org.scalatest:scalatest_${vs.scalaBinaryV}:${scalaTestV}")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
testImplementation("org.junit.jupiter:junit-jupiter:5.11.2")

testRuntimeOnly("co.helmethair:scalatest-junit-runner:0.2.0")
}
Expand Down
2 changes: 1 addition & 1 deletion dev/gradle-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ FWDIR="$(
pwd
)"

${FWDIR}/gradlew wrapper --gradle-version=8.7
${FWDIR}/gradlew wrapper --gradle-version=8.10.2

${FWDIR}/gradlew dependencyUpdates "$@"
2 changes: 1 addition & 1 deletion dev/publish-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CRDIR="$(
pwd
)"

for i in $(seq 7 14); do
for i in $(seq 7 15); do
echo " [PUBLISHING] -PscalaVersion=2.13.$i"
$CRDIR/publish.sh -PscalaVersion=2.13.$i
done
2 changes: 1 addition & 1 deletion dev/publishM2-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CRDIR="$(
pwd
)"

for i in $(seq 7 14); do
for i in $(seq 7 15); do
echo " [PUBLISHING] -PscalaVersion=2.13.$i"
$CRDIR/publishM2.sh -PscalaVersion=2.13.$i
done
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

scalaGroup=org.scala-lang

scalaVersion=2.13.14
scalaVersion=2.13.15

org.gradle.parallel=true
#org.gradle.caching=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit 01f37c0

Please sign in to comment.