Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for #100 (https://github.com/tek/splain/issues/100) #107

Merged
merged 3 commits into from
Sep 15, 2023
Merged

fix for #100 (https://github.com/tek/splain/issues/100) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20915ce
add back java targetCompatibility
tribbloid Sep 15, 2023
64b1a82
add Scala 2.13.12 profile
tribbloid Sep 15, 2023
1e65cf7
add publish-all.sh as a shortcut for publishing for all compiler vers…
tribbloid Jun 27, 2023
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 .github/workflows/main.yml
View file
Open in desktop
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.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11"]
scalaVersion: ["2.13.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12"]

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

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

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ allprojects {
}

val vn = VersionNumber.parse(vs.scalaV)
val supportedPatchVs = listOf(6, 7)
val supportedPatchVs = 6..12

for (from in supportedPatchVs) {
if (vn.micro >= from) {
Expand Down
11 changes: 11 additions & 0 deletions dev/publish-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

CRDIR="$(
cd "$(dirname "$0")" || exit
pwd
)"

for i in $(seq 6 12); do
echo " [PUBLISHING] -PscalaVersion=2.13.$i"
$CRDIR/publish.sh -PscalaVersion=2.13.$i
done
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scalaGroup=org.scala-lang
#scalaVersion=2.13.6
#scalaVersion=2.13.7
#scalaVersion=2.13.10
scalaVersion=2.13.11
scalaVersion=2.13.12

org.gradle.parallel=true
org.gradle.caching=true
4 changes: 4 additions & 0 deletions testing/acceptance/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ dependencies {

tasks {

var minJavaV = JavaVersion.VERSION_1_8.toString()

withType<ScalaCompile> {

targetCompatibility = minJavaV

scalaCompileOptions.apply {

additionalParameters!!.addAll(
Expand Down
Loading