Skip to content

Commit

Permalink
Merge pull request #667 from tumblr/develop
Browse files Browse the repository at this point in the history
Colossus 0.11.0
  • Loading branch information
benblack86 authored Jan 24, 2018
2 parents a260a79 + eb09202 commit 773e405
Show file tree
Hide file tree
Showing 179 changed files with 3,609 additions and 2,334 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: scala

scala:
- 2.11.7
- 2.12.2

jdk: oraclejdk8
Expand All @@ -18,7 +17,7 @@ cache:
- $HOME/.sbt/boot/

script:
- sbt ++$TRAVIS_SCALA_VERSION clean coverage testAll coverageReport coverageAggregate
- sbt +clean +coverage +testAll +coverageReport +coverageAggregate

before_cache:
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
Expand Down
18 changes: 17 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ In order to accept your pull request, we need you to submit a Contributor Licens
# Publish
1. Merge develop (or hot fix branch) into master.
2. Update version in `version.sbt` and add to `docs.yml`
2. Update version in `version.sbt` and add to `docs.yml` (append `RC{X}` for release candidates)
```bash
git add version.sbt
Expand Down Expand Up @@ -106,6 +106,22 @@ In order to accept your pull request, we need you to submit a Contributor Licens
6. Merge master into develop and update version in `version.sbt` to point to the next snapshot.
# Publishing Milestones
1. On develop update version (must end with `-M{milestone number}`) in `version.sbt`
```bash
git add version.sbt
git commit -m "v{VERSION NUMBER}"
```
2. Create tag using just the version (with `-M{X}`).
```bash
git tag -a v{VERSION NUMBER}
```
3. Push changes to remote; travis will build and automatically publish to [sonatype](https://oss.sonatype.org/).
```bash
git push --follow-tags
```
## License
By contributing to Colossus you agree that your contributions will be licensed under its Apache 2.0 license.
47 changes: 28 additions & 19 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import com.lightbend.paradox.sbt.ParadoxPlugin
import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._
import ProjectImplicits._

val AKKA_VERSION = "2.5.4"
val SCALATEST_VERSION = "3.0.1"
val MIMA_PREVIOUS_VERSIONS = Seq("0.9.1")
val AkkaVersion = "2.5.6"
val ScalatestVersion = "3.0.1"

val MIMAPreviousVersions = Seq("0.9.1")

lazy val testAll = TaskKey[Unit]("test-all")

Expand Down Expand Up @@ -36,13 +37,13 @@ lazy val GeneralSettings = Seq[Setting[_]](
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint"),
scalacOptions in (Compile, console) := Seq(),
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % AKKA_VERSION,
"com.typesafe.akka" %% "akka-testkit" % AKKA_VERSION,
"org.scalatest" %% "scalatest" % SCALATEST_VERSION % "test, it",
"com.typesafe.akka" %% "akka-actor" % AkkaVersion,
"com.typesafe.akka" %% "akka-testkit" % AkkaVersion % "test",
"org.scalatest" %% "scalatest" % ScalatestVersion % "test, it",
"org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
"org.mockito" % "mockito-all" % "1.9.5" % "test",
"org.mockito" % "mockito-all" % "1.9.5" % "test",
"com.github.nscala-time" %% "nscala-time" % "2.16.0",
"org.slf4j" % "slf4j-api" % "1.7.6"
"org.slf4j" % "slf4j-api" % "1.7.6"
),
coverageExcludedPackages := "colossus\\.examples\\..*;.*\\.testkit\\.*",
credentials += Credentials("Sonatype Nexus Repository Manager",
Expand Down Expand Up @@ -82,27 +83,28 @@ lazy val noPubSettings = GeneralSettings ++ Seq(
)

lazy val testkitDependencies = libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % SCALATEST_VERSION
"org.scalatest" %% "scalatest" % ScalatestVersion,
"com.typesafe.akka" %% "akka-testkit" % AkkaVersion
)

lazy val MetricSettings = ColossusSettings

lazy val ExamplesSettings = Seq(
libraryDependencies ++= Seq(
"org.json4s" %% "json4s-jackson" % "3.5.3",
"ch.qos.logback" % "logback-classic" % "1.2.2"
"org.json4s" %% "json4s-jackson" % "3.5.3",
"ch.qos.logback" % "logback-classic" % "1.2.2",
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.2",
"org.mockito" % "mockito-all" % "1.10.19"
)
)

lazy val RootProject = Project(id = "root", base = file("."))
lazy val RootProject = Project(id = "colossus-root", base = file("."))
.settings(noPubSettings: _*)
.configs(IntegrationTest)
.dependsOn(ColossusProject)
.aggregate(ColossusProject, ColossusTestkitProject, ColossusMetricsProject, ColossusExamplesProject, ColossusDocs)

lazy val ColossusProject: Project = Project(id = "colossus", base = file("colossus"))
.settings(ColossusSettings: _*)
.withMima(MIMA_PREVIOUS_VERSIONS : _*)
.withMima(MIMAPreviousVersions : _*)
.configs(IntegrationTest)
.aggregate(ColossusTestsProject)
.dependsOn(ColossusMetricsProject)
Expand All @@ -114,14 +116,14 @@ lazy val ColossusExamplesProject = Project(id = "colossus-examples", base = file
.dependsOn(ColossusProject)

lazy val ColossusMetricsProject = Project(id = "colossus-metrics", base = file("colossus-metrics"))
.settings(MetricSettings: _*)
.withMima(MIMA_PREVIOUS_VERSIONS : _*)
.settings(ColossusSettings: _*)
.withMima(MIMAPreviousVersions : _*)
.configs(IntegrationTest)

lazy val ColossusTestkitProject = Project(id = "colossus-testkit", base = file("colossus-testkit"))
.settings(ColossusSettings: _*)
.settings(testkitDependencies)
.withMima(MIMA_PREVIOUS_VERSIONS : _*)
.withMima(MIMAPreviousVersions : _*)
.configs(IntegrationTest)
.dependsOn(ColossusProject)

Expand All @@ -133,6 +135,7 @@ lazy val ColossusDocs = Project(id = "colossus-docs", base = file("colossus-docs
.settings(
paradoxTheme := Some(builtinParadoxTheme("generic")),
paradoxProperties ++= Map(
"github.base_url" -> s"https://github.com/tumblr/colossus/blob/${version.value}",
"extref.docs.base_url" -> s"https://static.javadoc.io/${organization.value}/colossus_2.11/${version.value}/index.html#%s",
"extref.docs-metrics.base_url" -> s"https://static.javadoc.io/${organization.value}/colossus-metrics_2.11/${version.value}/index.html#%s",
"extref.docs-testkit.base_url" -> s"https://static.javadoc.io/${organization.value}/colossus-testkit_2.11/${version.value}/index.html#%s",
Expand All @@ -146,4 +149,10 @@ lazy val ColossusTestsProject = Project(
id = "colossus-tests",
base = file("colossus-tests"),
dependencies = Seq(ColossusTestkitProject % "compile;test->test")
).settings(noPubSettings: _*).configs(IntegrationTest)
).settings(noPubSettings: _*)
.settings(
libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.2.2"
)
).configs(IntegrationTest)

144 changes: 144 additions & 0 deletions colossus-docs/src/main/paradox/_template/page.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<!DOCTYPE html>
<html class="no-js" lang="en">

<head>
<title>$page.title$$if(!page.home.active)$ · $page.home.title$$endif$</title>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta name="description" content='$page.properties.("project.description")$'/>
<link href="https://fonts.googleapis.com/css?family=Roboto:100normal,100italic,300normal,300italic,400normal,400italic,500normal,500italic,700normal,700italic,900normal,900italicc" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="$page.base$lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="$page.base$js/page.js"></script>
<script type="text/javascript" src="$page.base$js/groups.js"></script>
<link rel="stylesheet" type="text/css" href="$page.base$lib/normalize.css/normalize.css"/>
<link rel="stylesheet" type="text/css" href="$page.base$lib/foundation/dist/foundation.min.css"/>
<link rel="stylesheet" type="text/css" href="$page.base$css/page.css"/>

<link rel="shortcut icon" href="img/favicon.ico" />
</head>

<body>
<div class="off-canvas-wrapper">
<div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>

<div class="off-canvas position-left" id="off-canvas-menu" data-off-canvas>
<nav class="off-canvas-nav">
$navigation()$
</nav>
</div>

<div class="off-canvas-content" data-off-canvas-content>

<header class="site-header expanded row">
<div class="small-12 column">
<a href="#" class="off-canvas-toggle hide-for-medium" data-toggle="off-canvas-menu">$menu()$</a>
$title()$
</div>
</header>

<div class="expanded row">

<div class="medium-3 large-2 show-for-medium column">
<nav class="site-nav">
$navigation()$
</nav>
</div>

<div class="small-12 medium-9 large-10 column">
<section class="site-content">

<div class="page-header row">
<div class="medium-12 show-for-medium column">
$if(!page.home.active)$
<div class="nav-breadcrumbs">
$page.breadcrumbs$
</div>
$endif$
</div>
</div>

<div class="page-content row">
<div class="small-12 large-9 column" id="docs">
$page.content$
$source()$
$if(page.next.html)$
<div class="nav-next">
<p><strong>Next:</strong> $page.next.html$</p>
</div>
$endif$
</div>
<div class="large-3 show-for-large column" data-sticky-container>
$if(page.subheaders)$
<nav class="sidebar sticky" data-sticky data-anchor="docs" data-sticky-on="large">
<div class="page-nav">
<div class="nav-title">On this page:</div>
<div class="nav-toc">
$page.toc$
</div>
</div>
</nav>
$endif$
</div>
</div>

</section>
</div>

</div>

<footer class="site-footer">

<section class="site-footer-nav">
<div class="expanded row">
<div class="small-12 large-offset-2 large-10 column">
<div class="row site-footer-content">

<div class="small-12 medium-4 large-3 text-center column">
<div class="nav-links">
<ul>
<!-- <li><a href="https://www.example.com/products/">Products</a> -->
</ul>
</div>
</div>

</div>
</div>
</div>
</section>

<section class="site-footer-base">
<div class="expanded row">
<div class="small-12 large-offset-2 large-10 column">
<div class="row site-footer-content">

<div class="small-12 text-center large-9 column">

<!--
<div class="copyright">
<span class="text">&copy; $page.properties.("date.year")$</span>
<a href="https://www.example.com" class="logo">logo</a>
</div>
-->
</div>

</div>
</div>
</div>
</section>
</footer>

</div>
</div>
</div>
</body>

<script type="text/javascript" src="$page.base$lib/foundation/dist/foundation.min.js"></script>
<script type="text/javascript">jQuery(document).foundation();</script>
<script type="text/javascript" src="$page.base$js/magellan.js"></script>

<style type="text/css">@import "$page.base$lib/prettify/prettify.css";</style>
<script type="text/javascript" src="$page.base$lib/prettify/prettify.js"></script>
<script type="text/javascript" src="$page.base$lib/prettify/lang-scala.js"></script>
<script type="text/javascript">jQuery(function(){window.prettyPrint && prettyPrint()});</script>

</html>
Loading

0 comments on commit 773e405

Please sign in to comment.