Skip to content

Commit e184a24

Browse files
authored
Merge pull request scala#32 from scala/publishing
Update build to publish snapshots
2 parents 5a6ab15 + 141f2ed commit e184a24

File tree

4 files changed

+33
-6
lines changed

4 files changed

+33
-6
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
language: scala
22
jdk: oraclejdk8
33
script: sbt test
4+
after_succes:
5+
- '[[ $TRAVIS_BRANCH == "master" ]] && { sbt publish; }'
6+
env:
7+
global:
8+
- secure: tlhqsKV+GjB1SDUHuDixvgRoXsBwcquiaSD7n+6t5uZdTJk+9FFGswprDuLJqOAXYWPI+PSwA1PaVLJ5nV/dfqlKvQAHt7hA9NETpWs/3OhUAEEGpp9OjyCjYYQdefaN7urQ0ApuoUWN3YDimcP4xBdhtaic9ykxqMgeUCTGeqWd5OtKHvYdvaYBYqKInJUHQjhXBWToJcqWg60FEG1E+aiH8kc0QfOMOe4tzuC06CqpNZDGx57xjDgH/uAix7J5OLMHT+xz9TE2V08pfF2E986mWQu7xEbz4j9djmt9apbxsojKYlsnMgGMFmcLAB6B//Sf3OrPj7YpDXCDh/hoFfUUPcXi92zuNxCuKCceqDb6Bd863RTlPNl9z5HaFq4RYnB0038ayLgBrCJKJXbyGdfaR2a7zZ2RuBnyTN7WSp4R9uIzg6qE0oQ34LxPc86i0Ma5H0btxJyj2AahQnmifeg1Akg4empa1OlSNd5d1ZZRINfSaOsbeutJxQYhCdvh5SNon68QBLvE543AghHEhwVViBGecyRolTrxzAdT57dSqUhJ0oJXXqQ2MIgitalwrlOm4uKqXETjFueLYTp+Y/CCjW5WdY1BvC0vPLA04DXcJ3fN4bIlsXOPrhEZ5POrXkCorbgFJBhkN1vZaACOE0tAQw1F7DTcpa2sv50NQ5U=
9+
- secure: I3IWAHaKj97x2QERwLt4c8InLMX6qtIY7JamJCLcQiO/hPEv9TNyXjXBs+h35ccEFrqPMgx/BM4L21g98C7JEptlvlsXHwQPH3G9yQezsMGdH9OevpOpZuR4y2ZrEvsyTfqkWlm2MMugKZ9E1BFf/MPdy8sU9GxG7GATMEE4dK8WYxReKYJ+PlzKOedio6BaWIgssUCWA0fGgQzvOzDChjTvcz7E0OQiXi+8MqF5mLkQZ4hqsVARDOvR4ZkLxuDK909G3selY3dIUlaA7F4GMrhfQTt6MF6gNwqLKjTDbHrv7fsrByjL6iTvLUXCu7RM9vRkV9VTN8TsUKzsHb+ZMuu9hiR0I7dYVfr2v59D5CeSVbsu+hEPpmISZW4d/jHofhRdI5pa/gH0PR2D4LdZZQxTj04qS6R7OAVyNCys6fnfRmxX46rGxsTqJJLWxKMQ/zlvhYXsbTtw0d2C9ngvOhduJ8/bjHVblbonccrpEHo6ebtmTcp4/VrMm5UwmUAUVVnFvpwjst0UWOcvJlxpcIX2H7nL/IDjxJaej+KVXww4poj50ZxsLSuJ8EKEggWeCzDyrVCzmxrHWEc8nYVWFLFsQq2otCLe6JfDaSkzD31Lmcxf1QJlAVM3k6Qwk4KRLYTo9d9cefXiDps0PgUMvA1FrCEhSB2MGMlXRL8xzbM=

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,19 @@ Prototype improvements for Scala collections.
1717
~~~
1818
- Run the memory benchmark:
1919
~~~
20-
> memoryBenchmark/run
20+
> memoryBenchmark/charts
2121
~~~
2222
- Run the execution time benchmark:
2323
~~~
24-
> timeBenchmark/jmh:run
24+
> timeBenchmark/charts
2525
~~~
26+
27+
## Use it in your project
28+
29+
We publish snapshots on Sonatype:
30+
31+
~~~ scala
32+
resolvers += Resolver.sonatypeRepo("snapshots")
33+
34+
libraryDependencies += "ch.epfl.scala" %% "collection-strawman" % "0.1-SNAPSHOT"
35+
~~~

build.sbt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
organization in ThisBuild := "org.scala-lang"
1+
organization in ThisBuild := "ch.epfl.scala"
22

33
version in ThisBuild := "0.1-SNAPSHOT"
44

@@ -9,17 +9,24 @@ scalacOptions in ThisBuild ++=
99

1010
testOptions in ThisBuild += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a")
1111

12-
fork in Test := true
12+
fork in Test in ThisBuild := true
1313

14-
parallelExecution in Test := false
14+
parallelExecution in Test in ThisBuild := false
1515

1616
val collections =
1717
project.in(file("."))
1818
.settings(
19+
name := "collection-strawman",
1920
libraryDependencies ++= Seq(
2021
"org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0",
2122
"com.novocode" % "junit-interface" % "0.11" % Test
22-
)
23+
),
24+
credentials ++= (
25+
for {
26+
username <- sys.env.get("SONATYPE_USERNAME")
27+
password <- sys.env.get("SONATYPE_PASSWORD")
28+
} yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)
29+
).toList
2330
)
2431

2532
val timeBenchmark =

project/plugins.sbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
2+
3+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
4+
15
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.20")
26

37
// for bencharts

0 commit comments

Comments
 (0)