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.

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

Publish for Scala 2.13.16 and 3.6.3 (500USD Bounty) #1602

Closed
wants to merge 3 commits into from
Closed
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
10 changes: 5 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ jobs:
command: 'terminal.__.test'

- java-version: 11
command: 'sshd[{2.12.20,2.13.15,3.3.4,3.4.3,3.5.1}].__.test'
command: 'sshd[{2.12.20,2.13.16,3.3.4,3.4.3,3.5.1,3.6.3}].__.test'

- java-version: 11
command: 'amm.repl[2.12.{9,14,20}].__.test'
- java-version: 17
command: 'amm.repl[2.13.{4,9,15}].__.test'
command: 'amm.repl[2.13.{4,9,16}].__.test'
- java-version: 21
command: 'amm.repl[{3.3.4,3.4.3,3.5.1}].__.test'
command: 'amm.repl[{3.3.4,3.4.3,3.5.1,3.6.3}].__.test'

- java-version: 11
command: 'amm[2.12.{9,14,20}].__.test'
- java-version: 17
command: 'amm[2.13.{4,9,15}].__.test'
command: 'amm[2.13.{4,9,16}].__.test'
- java-version: 21
command: 'amm[{3.3.4,3.4.3,3.5.1}].__.test'
command: 'amm[{3.3.4,3.4.3,3.5.1,3.6.3}].__.test'

runs-on: ubuntu-latest
steps:
Expand Down
8 changes: 5 additions & 3 deletions build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,17 @@ val commitsSinceTaggedVersion = latestTaggedVersion match {
val scala2_12Versions = 9.to(20)
// .dropWhile(v => isJava21 && v < 18)
.map(v => s"2.12.${v}")
val scala2_13Versions = 2.to(15)
val scala2_13Versions = 2.to(16)
// .dropWhile(v => isJava21 && v < 11)
.map(v => s"2.13.${v}")
// TODO: We can't have 3.4.0 & 3.4.1 until we solve https://github.com/com-lihaoyi/Ammonite/issues/1395
val scala33Versions = Seq("3.3.4")
val scala34Versions = Seq("3.4.2", "3.4.3")
val scala35Versions = Seq("3.5.0", "3.5.1")
val scala36Versions = Seq("3.6.2", "3.6.3")

val scala2Versions = scala2_12Versions ++ scala2_13Versions
val scala3Versions = scala33Versions ++ scala34Versions ++ scala35Versions
val scala3Versions = scala33Versions ++ scala34Versions ++ scala35Versions ++ scala36Versions

val binCrossScalaVersions =
Seq(scala2_12Versions.last, scala2_13Versions.last, scala33Versions.last)
Expand All @@ -81,7 +82,8 @@ val assemblyCrossScalaVersions = Seq(
scala2_13Versions.last,
scala33Versions.last,
scala34Versions.last,
scala35Versions.last
scala35Versions.last,
scala36Versions.last
)
def isScala2_12_10OrLater(sv: String): Boolean = {
(sv.startsWith("2.12.") && sv.stripPrefix("2.12.").length > 1) || sv.startsWith("2.13.")
Expand Down
4 changes: 4 additions & 0 deletions readme/Footer.scalatex
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@


@sect{Changelog}
@sect{3.0.1}
@ul
@li
Support for Scala 2.13.16, 3.3.4
@sect{3.0.0}
@ul
@li
Expand Down
12 changes: 0 additions & 12 deletions readme/Index.scalatex
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,6 @@
want to run it later, save it into some @sect.ref{Scala Scripts} and run
those later.

@p
For a video overview of the project and it's motivation, check out this talk:

@iframe(
src := "https://player.vimeo.com/video/148552858",
width := 800,
height := 600,
attr("frameborder") := 0,
attr("webkitallowfullscreen") := 1,
attr("mozallowfullscreen") := 1,
attr("allowfullscreen") := 1
)
@p
If you are already working in Scala,
you no longer have to drop down to Python or Bash for your scripting needs:
Expand Down
Loading