Skip to content

Commit 8a170ea

Browse files
authored
Prepare release 3.0.0-M1 (#1452)
Pull request: #1452
1 parent f009b37 commit 8a170ea

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import scalatex.ScalatexReadme
33
lazy val readme = ScalatexReadme(
44
projectId = "readme",
55
wd = file(""),
6-
url = "https://github.com/com-lihaoyi/Ammonite/tree/master",
6+
url = "https://github.com/com-lihaoyi/Ammonite/tree/main",
77
source = "Index"
88
).settings(
99
scalaVersion := "2.12.18",

readme/Footer.scalatex

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@
127127

128128

129129
@sect{Changelog}
130+
@sect{3.0.0-M1}
131+
@ul
132+
@li
133+
This release is not binary compatible with Ammonite 2.5!
134+
@li
135+
Support for Scala 2.12.18, 2.12.19, 2.13.11, 2.13.12, 2.13.13, 3.3.1, 3.3.2, 3.3.3
136+
@li
137+
The Scala 3 version now no longer depends on dependencies built with Scala 2.13
138+
@li
139+
Various dependency updates
140+
@li
141+
Internal fixes and improvements
130142
@sect{2.5.11}
131143
@ul
132144
@li
@@ -1759,7 +1771,7 @@
17591771
generally work - the automated test suite is pretty comprehensive - but
17601772
they are still more-likely to have bugs than numbered releases.
17611773
@p
1762-
Any pull-request that gets merged into master is published as an unstable
1774+
Any pull-request that gets merged into the main branch is published as an unstable
17631775
version automatically within an hour or two of being merged, so if you
17641776
notice some problem and know how to fix it, send a PR, get it merged, and
17651777
you can use the published unstable version with your fix until the next

readme/Scripts.scalatex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
@p
3232
As an example, Ammonite's own
33-
@lnk("Continuous Integration Scripts", "https://github.com/lihaoyi/Ammonite/tree/master/ci")
33+
@lnk("Continuous Integration Scripts", "https://github.com/lihaoyi/Ammonite/tree/main/ci")
3434
are written as @code{.sc} Scala Scripts, as are @lnk("Haoyi's blog",
3535
"https://github.com/lihaoyi/blog") and @lnk("resume",
3636
"https://github.com/lihaoyi/Resume"). These are all examples of using

0 commit comments

Comments
 (0)