From a90d4aa75e7fdf12a85177f4e81463439bfe5bb3 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Tue, 15 Aug 2017 00:33:06 +0200 Subject: separate the build into core, testkit and core-tests projects --- build.sbt | 70 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 36 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 37b3abe3..ccd74cd6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ /* ========================================================================================= - * Copyright © 2013-2016 the kamon project + * Copyright © 2013-2017 the kamon project * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of the License at @@ -14,51 +14,49 @@ */ -scalaVersion := "2.11.8" -crossScalaVersions := Seq("2.12.2", "2.11.8", "2.10.6") -concurrentRestrictions in Global += Tags.limit(Tags.Test, 1) - lazy val kamon = (project in file(".")) .settings(moduleName := "kamon") .settings(noPublishing: _*) - .aggregate(core) + .aggregate(core, testkit, coreTests) +val commonSettings = Seq( + isSnapshot := true, + scalaVersion := "2.11.8", + javacOptions += "-XDignore.symbol.file", + resolvers += Resolver.mavenLocal, + crossScalaVersions := Seq("2.12.2", "2.11.8", "2.10.6"), + concurrentRestrictions in Global += Tags.limit(Tags.Test, 1) +) lazy val core = (project in file("kamon-core")) .settings(moduleName := "kamon-core") + .settings(commonSettings: _*) .settings( - isSnapshot := true, - scalaVersion := "2.11.8", - javacOptions += "-XDignore.symbol.file", - resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "com.typesafe" % "config" % "1.3.1", - "org.slf4j" % "slf4j-api" % "1.7.7", - "org.hdrhistogram" % "HdrHistogram" % "2.1.9", - - "com.lihaoyi" %% "fansi" % "0.2.4", - "org.scalatest" %% "scalatest" % "3.0.1" % "test", - "ch.qos.logback" % "logback-classic" % "1.2.2" % "test" + "com.typesafe" % "config" % "1.3.1", + "org.slf4j" % "slf4j-api" % "1.7.25", + "org.hdrhistogram" % "HdrHistogram" % "2.1.9", + "com.lihaoyi" %% "fansi" % "0.2.4" ) ) -// -//lazy val testkit = (project in file("kamon-testkit")) -// .settings(moduleName := "kamon-testkit", resolvers += Resolver.mavenLocal) -// .settings( -// libraryDependencies ++= -// compileScope(akkaDependency("actor").value, akkaDependency("testkit").value) ++ -// providedScope(aspectJ) ++ -// testScope(slf4jApi, slf4jnop) -// ).dependsOn(core) +lazy val testkit = (project in file("kamon-testkit")) + .settings(moduleName := "kamon-testkit") + .settings(commonSettings: _*) + .settings( + libraryDependencies ++= Seq( + "org.scalatest" %% "scalatest" % "3.0.1" + ) + ).dependsOn(core) + -// -//lazy val coreTests = (project in file("kamon-core-tests")) -// .settings(moduleName := "kamon-core-tests", resolvers += Resolver.mavenLocal) -// .settings(noPublishing: _*) -// .settings( -// libraryDependencies ++= -// compileScope(akkaDependency("actor").value, akkaDependency("testkit").value) ++ -// providedScope(aspectJ) ++ -// testScope(slf4jApi, slf4jnop) -// ).dependsOn(testkit ) +lazy val coreTests = (project in file("kamon-core-tests")) + .settings(moduleName := "kamon-core-tests", resolvers += Resolver.mavenLocal) + .settings(noPublishing: _*) + .settings(commonSettings: _*) + .settings( + libraryDependencies ++= Seq( + "org.scalatest" %% "scalatest" % "3.0.1" % "test", + "ch.qos.logback" % "logback-classic" % "1.2.2" % "test" + ) + ).dependsOn(testkit) -- cgit v1.2.3