Skip to content

Commit 14a7d67

Browse files
committed
upgrade to sbt 0.13.13
1 parent 4cc0d67 commit 14a7d67

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ into a Scala `$version` distribution (zip, tar.gz, deb, rpm, and msi).
55

66
To build a distribution, run:
77

8-
* `universal:package-bin` - Builds the universal zip installer
9-
* `universal-docs:package-bin` - Builds the universal documentation zip
10-
* `debian:package-bin` - Builds the Debian DEB file. *requires dpkg-deb*
11-
* `rpm:package-bin` - Builds the yum RPM file. *requires rpmbuild*
12-
* `windows:package-bin` - Builds the Windows MSI. *requires WiX 3.6*
8+
* `universal:packageBin` - Builds the universal zip installer
9+
* `universal-docs:packageBin` - Builds the universal documentation zip
10+
* `debian:packageBin` - Builds the Debian DEB file. *requires dpkg-deb*
11+
* `rpm:packageBin` - Builds the yum RPM file. *requires rpmbuild*
12+
* `windows:packageBin` - Builds the Windows MSI. *requires WiX 3.6*
1313

14-
Alternatively, the `s3-upload` task's mappings are configured based on the platform
14+
Alternatively, the `s3Upload` task's mappings are configured based on the platform
1515
the installer is running on. On Windows, it builds the MSI; on another platform,
1616
it'll create and upload the other packages in the above list. (Use `s3Upload::mappings` for a dry-run.)
1717

1818
The version of Scala to package is derived from the most recent git tag,
1919
or you can specify it using `-Dproject.version`.
2020

21-
This packager only works for Scala 2.11+ releases (starting with M8),
21+
This packager only works for Scala 2.11+ releases,
2222
as earlier ones did not publish the `scala-dist` artifact to maven.
2323

2424
Due to limited resources, the native packages are quite rudimentary.
@@ -44,7 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r
4444

4545
## Contributing ##
4646
Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy)
47-
and sign the [CLA](http://typesafe.com/contribute/cla/scala).
47+
and sign the [CLA](http://www.lightbend.com/contribute/cla/scala).
4848

4949
The branching structure mimics that of [scala/scala](https://github.com/scala/scala):
5050
branches for 2.11.x, 2.12.x, etc.

project/Wix.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ object Wix {
1919
// wixProductComments := "Scala Programming language for use in Windows.",
2020

2121
wixProductConfig := makeProductConfig((stagingDirectory in Universal).value, (stagingDirectory in UniversalDocs).value),
22-
wixProductConfig <<= (wixProductConfig
22+
wixProductConfig := (wixProductConfig
2323
dependsOn (stage in Universal)
24-
dependsOn (stage in UniversalDocs)),
24+
dependsOn (stage in UniversalDocs)).value,
2525

2626
packageBin in Windows := {
2727
val versioned = target.value / s"${name.value}-${version.value}.msi"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.9
1+
sbt.version=0.13.13

0 commit comments

Comments
 (0)