aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md18
-rw-r--r--build/build.scala9
-rw-r--r--stage1/MavenRepository.scala22
-rw-r--r--stage1/Stage1.scala13
-rw-r--r--stage1/Stage1Lib.scala75
-rw-r--r--stage1/resolver.scala151
-rw-r--r--stage2/AdminTasks.scala42
-rw-r--r--stage2/BasicBuild.scala27
-rw-r--r--stage2/BuildBuild.scala5
-rw-r--r--stage2/BuildDependency.scala1
-rw-r--r--stage2/GitDependency.scala1
-rw-r--r--stage2/SbtDependencyDsl.scala43
-rw-r--r--stage2/mixins.scala4
-rw-r--r--test/simple/build/build.scala34
-rw-r--r--test/test.scala53
15 files changed, 307 insertions, 191 deletions
diff --git a/README.md b/README.md
index 36f1f50..84259da 100644
--- a/README.md
+++ b/README.md
@@ -48,14 +48,16 @@ class Build(context: cbt.Context) extends PackageBuild(context){
override def version = "0.6.1-SNAPSHOT"
override def groupId = "org.cvogt"
override def artifactId = "play-json-extensions"
- override def dependencies = super.dependencies ++ Vector(
- // encouraged way to declare dependencies
- ScalaDependency("com.typesafe.play", "play-json", "2.4.4"),
- JavaDependency("joda-time", "joda-time", "2.9.2")
- // also supported for SBT syntax compatibility:
- // "com.typesafe.play" %% "play-json" % "2.4.4"
- // "joda-time" % "joda-time % "2.9.2"
- )
+ override def dependencies =
+ super.dependencies :+
+ MavenRepository.central.resolve(
+ // encouraged way to declare dependencies
+ ScalaDependency("com.typesafe.play", "play-json", "2.4.4"),
+ MavenDependency("joda-time", "joda-time", "2.9.2")
+ // also supported for SBT syntax compatibility:
+ // "com.typesafe.play" %% "play-json" % "2.4.4"
+ // Maven.central % "joda-time" % "joda-time % "2.9.2"
+ )
override def compile = {
println("Compiling...")
super.compile
diff --git a/build/build.scala b/build/build.scala
index aa5d27a..6dfd395 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -5,11 +5,10 @@ import scala.collection.immutable.Seq
class Build(context: Context) extends BasicBuild(context){
// FIXME: somehow consolidate this with cbt's own boot-strapping from source.
- override def dependencies = super.dependencies ++ Seq(
- JavaDependency("org.scala-lang","scala-library",constants.scalaVersion),
- JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
- JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
- JavaDependency("com.typesafe.zinc","zinc","0.3.9"),
+ override def dependencies = super.dependencies :+ MavenRepository.central.resolve(
+ MavenDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
+ MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
+ MavenDependency("com.typesafe.zinc","zinc","0.3.9"),
ScalaDependency("org.scala-lang.modules","scala-xml","1.0.5")
)
override def sources = Seq(
diff --git a/stage1/MavenRepository.scala b/stage1/MavenRepository.scala
new file mode 100644
index 0000000..bfd52a7
--- /dev/null
+++ b/stage1/MavenRepository.scala
@@ -0,0 +1,22 @@
+package cbt
+import scala.collection.immutable.Seq
+import java.net._
+case class MavenRepository(url: URL){
+ def resolve( dependencies: MavenDependency* )(implicit logger: Logger): BoundMavenDependencies
+ = new BoundMavenDependencies( Seq(url), dependencies.to )
+ def resolveOne( dependency: MavenDependency )(implicit logger: Logger): BoundMavenDependency
+ = BoundMavenDependency( dependency, Seq(url) )
+}
+
+object MavenRepository{
+ case class combine(repositories: MavenRepository*){
+ def resolve( dependencies: MavenDependency* )(implicit logger: Logger): BoundMavenDependencies
+ = new BoundMavenDependencies( repositories.map(_.url).to, dependencies.to )
+ }
+ def central = MavenRepository(new URL(NailgunLauncher.MAVEN_URL))
+ def jcenter = MavenRepository(new URL("https://jcenter.bintray.com/releases"))
+ def bintray(owner: String) = MavenRepository(new URL(s"https://dl.bintray.com/$owner/maven"))
+ private val sonatypeBase = new URL("https://oss.sonatype.org/content/repositories/")
+ def sonatype = MavenRepository(sonatypeBase ++ "releases")
+ def sonatypeSnapshots = MavenRepository(sonatypeBase ++ "snapshots")
+}
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index 368a459..050d494 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -57,24 +57,15 @@ object Stage1{
val lib = new Stage1Lib(logger)
import lib._
-
- val sourceFiles = stage2.listFiles.toVector.filter(_.isFile).filter(_.toString.endsWith(".scala"))
- val changeIndicator = stage2Target ++ "/cbt/Build.class"
-
- val deps = Dependencies(
- JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
- JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r")
- )
-
val classLoaderCache = new ClassLoaderCache(logger)
+ val sourceFiles = stage2.listFiles.toVector.filter(_.isFile).filter(_.toString.endsWith(".scala"))
val cbtHasChanged = _cbtChanged || lib.needsUpdate(sourceFiles, stage2StatusFile)
logger.stage1("Compiling stage2 if necessary")
- val scalaXml = JavaDependency("org.scala-lang.modules","scala-xml_"+constants.scalaMajorVersion,constants.scalaXmlVersion)
compile(
cbtHasChanged,
sourceFiles, stage2Target, stage2StatusFile,
- nailgunTarget +: stage1Target +: Dependencies(deps, scalaXml).classpath,
+ CbtDependency().dependencyClasspath,
Seq("-deprecation"), classLoaderCache,
zincVersion = "0.3.9", scalaVersion = constants.scalaVersion
)
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala
index 39310b9..da9f8dd 100644
--- a/stage1/Stage1Lib.scala
+++ b/stage1/Stage1Lib.scala
@@ -56,23 +56,35 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
def blue(string: String) = scala.Console.BLUE++string++scala.Console.RESET
def green(string: String) = scala.Console.GREEN++string++scala.Console.RESET
- def download(urlString: URL, target: File, sha1: Option[String]){
- val incomplete = Paths.get( target.string ++ ".incomplete" );
- if( !target.exists ){
- target.getParentFile.mkdirs
- logger.resolver(blue("downloading ") ++ urlString.string)
- logger.resolver(blue("to ") ++ target.string)
- val stream = urlString.openStream
- Files.copy(stream, incomplete, StandardCopyOption.REPLACE_EXISTING)
- sha1.foreach{
- hash =>
- val expected = hash
- val actual = this.sha1(Files.readAllBytes(incomplete))
- assert( expected == actual, s"$expected == $actual" )
- logger.resolver( green("verified") ++ " checksum for " ++ target.string)
+ def download(url: URL, target: File, sha1: Option[String]): Boolean = {
+ if( target.exists ){
+ true
+ } else {
+ val incomplete = Paths.get( target.string ++ ".incomplete" );
+ val connection = url.openConnection.asInstanceOf[HttpURLConnection]
+ if(connection.getResponseCode != HttpURLConnection.HTTP_OK){
+ logger.resolver(blue("not found: ") ++ url.string)
+ false
+ } else {
+ logger.resolver(blue("downloading ") ++ url.string)
+ logger.resolver(blue("to ") ++ target.string)
+ target.getParentFile.mkdirs
+ val stream = connection.getInputStream
+ try{
+ Files.copy(stream, incomplete, StandardCopyOption.REPLACE_EXISTING)
+ } finally {
+ stream.close()
+ }
+ sha1.foreach{
+ hash =>
+ val expected = hash
+ val actual = this.sha1(Files.readAllBytes(incomplete))
+ assert( expected == actual, s"$expected == $actual" )
+ logger.resolver( green("verified") ++ " checksum for " ++ target.string)
+ }
+ Files.move(incomplete, Paths.get(target.string), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
+ true
}
- stream.close
- Files.move(incomplete, Paths.get(target.string), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
}
}
@@ -137,26 +149,37 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
None
}else{
if( needsRecompile ){
- val zinc = JavaDependency("com.typesafe.zinc","zinc", zincVersion)
+ import MavenRepository.central
+ val zinc = central.resolveOne(MavenDependency("com.typesafe.zinc","zinc", zincVersion))
val zincDeps = zinc.transitiveDependencies
val sbtInterface =
zincDeps
- .collect{ case d @ JavaDependency( "com.typesafe.sbt", "sbt-interface", _, Classifier.none ) => d }
+ .collect{ case d @
+ BoundMavenDependency(
+ MavenDependency( "com.typesafe.sbt", "sbt-interface", _, Classifier.none),
+ _
+ ) => d
+ }
.headOption
.getOrElse( throw new Exception(s"cannot find sbt-interface in zinc $zincVersion dependencies: "++zincDeps.toString) )
.jar
val compilerInterface =
zincDeps
- .collect{ case d @ JavaDependency( "com.typesafe.sbt", "compiler-interface", _, Classifier.sources ) => d }
+ .collect{ case d @
+ BoundMavenDependency(
+ MavenDependency( "com.typesafe.sbt", "compiler-interface", _, Classifier.sources),
+ _
+ ) => d
+ }
.headOption
.getOrElse( throw new Exception(s"cannot find compiler-interface in zinc $zincVersion dependencies: "++zincDeps.toString) )
.jar
- val scalaLibrary = JavaDependency("org.scala-lang","scala-library",scalaVersion).jar
- val scalaReflect = JavaDependency("org.scala-lang","scala-reflect",scalaVersion).jar
- val scalaCompiler = JavaDependency("org.scala-lang","scala-compiler",scalaVersion).jar
+ val scalaLibrary = central.resolveOne(MavenDependency("org.scala-lang","scala-library",scalaVersion)).jar
+ val scalaReflect = central.resolveOne(MavenDependency("org.scala-lang","scala-reflect",scalaVersion)).jar
+ val scalaCompiler = central.resolveOne(MavenDependency("org.scala-lang","scala-compiler",scalaVersion)).jar
val start = System.currentTimeMillis
@@ -212,9 +235,9 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
def ScalaDependency(
groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none,
- scalaVersion: String
+ scalaMajorVersion: String
) =
- JavaDependency(
- groupId, artifactId ++ "_" ++ scalaVersion, version, classifier
+ MavenDependency(
+ groupId, artifactId ++ "_" ++ scalaMajorVersion, version, classifier
)
-} \ No newline at end of file
+}
diff --git a/stage1/resolver.scala b/stage1/resolver.scala
index 701871c..ea20b89 100644
--- a/stage1/resolver.scala
+++ b/stage1/resolver.scala
@@ -35,7 +35,7 @@ abstract class Dependency{
def exportedJars: Seq[File]
def jars: Seq[File] = exportedJars ++ dependencyJars
- def canBeCached = false
+ def canBeCached: Boolean
//private type BuildCache = KeyLockedLazyCache[Dependency, Future[ClassPath]]
def exportClasspathConcurrently: ClassPath = {
@@ -68,7 +68,7 @@ abstract class Dependency{
d =>
// find out latest version of the required dependency
val l = d match {
- case m: JavaDependency => latest( (m.groupId,m.artifactId) )
+ case m: BoundMavenDependency => latest( (m.groupId,m.artifactId) )
case _ => d
}
// // trigger compilation if not already triggered
@@ -166,7 +166,7 @@ abstract class Dependency{
case _:ArtifactInfo => false
case _ => true
}
- noInfo ++ JavaDependency.updateOutdated( hasInfo ).reverse.distinct
+ noInfo ++ BoundMavenDependency.updateOutdated( hasInfo ).reverse.distinct
}
def show: String = this.getClass.getSimpleName
@@ -182,9 +182,9 @@ abstract class Dependency{
}
// TODO: all this hard codes the scala version, needs more flexibility
-class ScalaCompilerDependency(version: String)(implicit logger: Logger) extends JavaDependency("org.scala-lang","scala-compiler",version)
-class ScalaLibraryDependency (version: String)(implicit logger: Logger) extends JavaDependency("org.scala-lang","scala-library",version)
-class ScalaReflectDependency (version: String)(implicit logger: Logger) extends JavaDependency("org.scala-lang","scala-reflect",version)
+class ScalaCompilerDependency(version: String)(implicit logger: Logger) extends BoundMavenDependency(MavenDependency("org.scala-lang","scala-compiler",version, Classifier.none), Seq(MavenRepository.central.url))
+class ScalaLibraryDependency (version: String)(implicit logger: Logger) extends BoundMavenDependency(MavenDependency("org.scala-lang","scala-library",version, Classifier.none), Seq(MavenRepository.central.url))
+class ScalaReflectDependency (version: String)(implicit logger: Logger) extends BoundMavenDependency(MavenDependency("org.scala-lang","scala-reflect",version, Classifier.none), Seq(MavenRepository.central.url))
case class ScalaDependencies(version: String)(implicit val logger: Logger) extends Dependency{ sd =>
override final val needsUpdate = false
@@ -199,7 +199,7 @@ case class ScalaDependencies(version: String)(implicit val logger: Logger) exten
)
}
-case class BinaryDependency( path: File, dependencies: Seq[Dependency] )(implicit val logger: Logger) extends Dependency{
+case class BinaryDependency( path: File, dependencies: Seq[Dependency], canBeCached: Boolean )(implicit val logger: Logger) extends Dependency{
def exportedClasspath = ClassPath(Seq(path))
def exportedJars = Seq[File](path)
override def needsUpdate = false
@@ -207,16 +207,19 @@ case class BinaryDependency( path: File, dependencies: Seq[Dependency] )(implici
}
/** Allows to easily assemble a bunch of dependencies */
-case class Dependencies( _dependencies: Dependency* )(implicit val logger: Logger) extends Dependency{
- override def dependencies = _dependencies.to
- def needsUpdate = dependencies.exists(_.needsUpdate)
- def exportedClasspath = ClassPath(Seq())
- def exportedJars = Seq()
- def targetClasspath = ClassPath(Seq())
+case class Dependencies( dependencies: Seq[Dependency] )(implicit val logger: Logger) extends Dependency{
+ override def needsUpdate = dependencies.exists(_.needsUpdate)
+ override def canBeCached = dependencies.forall(_.canBeCached)
+ override def exportedClasspath = ClassPath(Seq())
+ override def exportedJars = Seq()
+ override def targetClasspath = ClassPath(Seq())
+}
+object Dependencies{
+ def apply( dependencies: Dependency* )(implicit logger: Logger): Dependencies = Dependencies( dependencies.to )
}
case class Stage1Dependency()(implicit val logger: Logger) extends Dependency{
- def needsUpdate = false // FIXME: think this through, might allow simplifications and/or optimizations
+ override def needsUpdate = false // FIXME: think this through, might allow simplifications and/or optimizations
override def canBeCached = false
/*
private object classLoaderRecursionCache extends Cache[ClassLoader]
@@ -232,23 +235,27 @@ case class Stage1Dependency()(implicit val logger: Logger) extends Dependency{
override def exportedClasspath = ClassPath( Seq(nailgunTarget, stage1Target) )
override def exportedJars = ???//Seq[File]()
override def dependencies = Seq(
- JavaDependency("org.scala-lang","scala-library",constants.scalaVersion),
- JavaDependency("org.scala-lang.modules","scala-xml_"+constants.scalaMajorVersion,"1.0.5")
+ MavenRepository.central.resolve(
+ MavenDependency("org.scala-lang","scala-library",constants.scalaVersion),
+ MavenDependency("org.scala-lang.modules","scala-xml_"+constants.scalaMajorVersion,"1.0.5")
+ )
)
// FIXME: implement sanity check to prevent using incompatible scala-library and xml version on cp
override def classLoaderRecursion( latest: Map[(String,String),Dependency], cache: ClassLoaderCache )
= getClass.getClassLoader
}
case class CbtDependency()(implicit val logger: Logger) extends Dependency{
- def needsUpdate = false // FIXME: think this through, might allow simplifications and/or optimizations
+ override def needsUpdate = false // FIXME: think this through, might allow simplifications and/or optimizations
override def canBeCached = false
override def targetClasspath = exportedClasspath
override def exportedClasspath = ClassPath( Seq( stage2Target ) )
override def exportedJars = ???
override def dependencies = Seq(
Stage1Dependency(),
- JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
- JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r")
+ MavenRepository.central.resolve(
+ MavenDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
+ MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r")
+ )
)
}
@@ -258,19 +265,30 @@ object Classifier{
object javadoc extends Classifier(Some("javadoc"))
object sources extends Classifier(Some("sources"))
}
+abstract class DependenciesProxy{
-case class JavaDependency(
+}
+class BoundMavenDependencies(
+ urls: Seq[URL], mavenDependencies: Seq[MavenDependency]
+)(implicit logger: Logger) extends Dependencies(
+ mavenDependencies.map( BoundMavenDependency(_,urls) )
+)
+case class MavenDependency(
groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none
+)
+case class BoundMavenDependency(
+ mavenDependency: MavenDependency, repositories: Seq[URL]
)(implicit val logger: Logger) extends ArtifactInfo{
+ val MavenDependency( groupId, artifactId, version, classifier ) = mavenDependency
assert(
Option(groupId).collect{
- case JavaDependency.ValidIdentifier(_) =>
+ case BoundMavenDependency.ValidIdentifier(_) =>
}.nonEmpty,
s"not a valid groupId: '$groupId'"
)
assert(
Option(artifactId).collect{
- case JavaDependency.ValidIdentifier(_) =>
+ case BoundMavenDependency.ValidIdentifier(_) =>
}.nonEmpty,
s"not a valid artifactId: '$artifactId'"
)
@@ -280,62 +298,60 @@ case class JavaDependency(
)
override def needsUpdate = false
- override def canBeCached = true
+ override def canBeCached = dependencies.forall(_.canBeCached)
private val groupPath = groupId.split("\\.").mkString("/")
- def basePath = s"/$groupPath/$artifactId/$version/$artifactId-$version" ++ classifier.name.map("-"++_).getOrElse("")
+ protected[cbt] def basePath = s"/$groupPath/$artifactId/$version/$artifactId-$version" ++ classifier.name.map("-"++_).getOrElse("")
- private def resolverUrl:URL = new URL(
- if(version.endsWith("-SNAPSHOT")) "https://oss.sonatype.org/content/repositories/snapshots" else "https://repo1.maven.org/maven2"
- )
- private def baseUrl: URL = resolverUrl ++ basePath
- private def baseFile: File = mavenCache ++ basePath
- private def pomFile: File = baseFile ++ ".pom"
- private def jarFile: File = baseFile ++ ".jar"
//private def coursierJarFile = userHome++"/.coursier/cache/v1/https/repo1.maven.org/maven2"++basePath++".jar"
- private def pomUrl: URL = baseUrl ++ ".pom"
- private[cbt] def jarUrl: URL = baseUrl ++ ".jar"
- def exportedJars = Seq( jar )
- def exportedClasspath = ClassPath( exportedJars )
- def targetClasspath = exportedClasspath
+ override def exportedJars = Seq( jar )
+ override def exportedClasspath = ClassPath( exportedJars )
+ override def targetClasspath = exportedClasspath
import scala.collection.JavaConversions._
-
- def jarSha1 = {
- val file = jarFile ++ ".sha1"
- lib.download( jarUrl ++ ".sha1" , file, None )
- // split(" ") here so checksum file contents in this format work: df7f15de037a1ee4d57d2ed779739089f560338c jna-3.2.2.pom
- Files.readAllLines(Paths.get(file.string)).mkString("\n").split(" ").head.trim
+
+ private def resolve(suffix: String, hash: Option[String]): File = {
+ val file = mavenCache ++ basePath ++ "." ++ suffix
+ val urls = repositories.map(_ ++ basePath ++ "." ++ suffix)
+ urls.find(
+ lib.download(_, file, hash)
+ ).getOrElse(
+ throw new Exception(s"\nCannot resolve\n$this\nCan't find any of\n"++urls.mkString("\n"))
+ )
+ file
}
- def pomSha1 = {
- val file = pomFile++".sha1"
- lib.download( pomUrl++".sha1" , file, None )
- // split(" ") here so checksum file contents in this format work: df7f15de037a1ee4d57d2ed779739089f560338c jna-3.2.2.pom
- Files.readAllLines(Paths.get(file.string)).mkString("\n").split(" ").head.trim
+ private def resolveHash(suffix: String) = {
+ Files.readAllLines(
+ resolve( suffix ++ ".sha1", None ).toPath
+ ).mkString("\n").split(" ").head.trim
}
+
+ private object jarSha1Cache extends Cache[String]
+ def jarSha1: String = jarSha1Cache{ resolveHash("jar") }
+
+ private object pomSha1Cache extends Cache[String]
+ def pomSha1: String = pomSha1Cache{ resolveHash("pom") }
private object jarCache extends Cache[File]
- def jar = jarCache{
- lib.download( jarUrl, jarFile, Some(jarSha1) )
- jarFile
- }
- def pomXml = XML.loadFile(pom.toString)
+ def jar: File = jarCache{ resolve("jar", Some(jarSha1)) }
- def pom = {
- lib.download( pomUrl, pomFile, Some(pomSha1) )
- pomFile
- }
+ private object pomCache extends Cache[File]
+ def pom: File = pomCache{ resolve("pom", Some(pomSha1)) }
+ def pomXml = XML.loadFile(pom.string)
// ========== pom traversal ==========
- lazy val transitivePom: Seq[JavaDependency] = {
+ lazy val transitivePom: Seq[BoundMavenDependency] = {
(pomXml \ "parent").collect{
case parent =>
- JavaDependency(
- (parent \ "groupId").text,
- (parent \ "artifactId").text,
- (parent \ "version").text
+ BoundMavenDependency(
+ MavenDependency(
+ (parent \ "groupId").text,
+ (parent \ "artifactId").text,
+ (parent \ "version").text
+ ),
+ repositories
)(logger)
}.flatMap(_.transitivePom) :+ this
}
@@ -362,7 +378,7 @@ case class JavaDependency(
}
).toMap
- def dependencies: Seq[JavaDependency] = {
+ def dependencies: Seq[BoundMavenDependency] = {
if(classifier == Classifier.sources) Seq()
else (pomXml \ "dependencies" \ "dependency").collect{
case xml if (xml \ "scope").text == "" && (xml \ "optional").text != "true" =>
@@ -383,9 +399,12 @@ case class JavaDependency(
throw new Exception(s"$artifactId not found in \n$dependencyVersions")
)
)
- JavaDependency(
- groupId, artifactId, version,
- Classifier( Some( (xml \ "classifier").text ).filterNot(_ == "").filterNot(_ == null) )
+ BoundMavenDependency(
+ MavenDependency(
+ groupId, artifactId, version,
+ Classifier( Some( (xml \ "classifier").text ).filterNot(_ == "").filterNot(_ == null) )
+ ),
+ repositories
)
}.toVector
}
@@ -411,7 +430,7 @@ case class JavaDependency(
}
}
}
-object JavaDependency{
+object BoundMavenDependency{
def ValidIdentifier = "^([A-Za-z0-9_\\-.]+)$".r // according to maven's DefaultModelValidator.java
def semanticVersionLessThan(left: String, right: String) = {
// FIXME: this ignores ends when different size
diff --git a/stage2/AdminTasks.scala b/stage2/AdminTasks.scala
index a18c16a..655b2b0 100644
--- a/stage2/AdminTasks.scala
+++ b/stage2/AdminTasks.scala
@@ -9,7 +9,7 @@ class AdminTasks(lib: Lib, args: Seq[String], cwd: File){
args(1).split(",").toVector.map{
d =>
val v = d.split(":")
- new JavaDependency(v(0),v(1),v(2)).classpath
+ MavenRepository.central.resolveOne(MavenDependency(v(0),v(1),v(2))).classpath
}
)
}
@@ -17,15 +17,17 @@ class AdminTasks(lib: Lib, args: Seq[String], cwd: File){
args(1).split(",").toVector.map{
d =>
val v = d.split(":")
- new JavaDependency(v(0),v(1),v(2)).dependencyTree
+ MavenRepository.central.resolveOne(MavenDependency(v(0),v(1),v(2))).dependencyTree
}.mkString("\n\n")
}
def amm = ammonite
def ammonite = {
val version = args.lift(1).getOrElse(constants.scalaVersion)
val scalac = new ScalaCompilerDependency( version )
- val d = JavaDependency(
- "com.lihaoyi","ammonite-repl_2.11.7",args.lift(1).getOrElse("0.5.7")
+ val d = MavenRepository.central.resolveOne(
+ MavenDependency(
+ "com.lihaoyi","ammonite-repl_2.11.7",args.lift(1).getOrElse("0.5.7")
+ )
)
// FIXME: this does not work quite yet, throws NoSuchFileException: /ammonite/repl/frontend/ReplBridge$.class
lib.runMain(
@@ -46,41 +48,25 @@ class AdminTasks(lib: Lib, args: Seq[String], cwd: File){
val scalaMajorVersion = scalaVersion.split("\\.").take(2).mkString(".")
val scalaXmlVersion = args.lift(2).getOrElse(constants.scalaXmlVersion)
val zincVersion = args.lift(3).getOrElse(constants.zincVersion)
- /*
- def tree(d: JavaDependency, indent: Int): String ={
- val dependencies = {
- if( d.dependencies.nonEmpty ){
- d.dependencies.map{
- case d: JavaDependency => tree(d,indent + 1)
- }.mkString(",\n" ++ ( " " * indent ),",\n" ++ ( " " * indent ), "")
- } else ""
- }
- (
- s"""new EarlyDependency( "${d.groupId}", "${d.artifactId}", "${d.version}", "${d.jarSha1}"$dependencies)"""
- )
- }*/
val scalaDeps = Seq(
- JavaDependency("org.scala-lang","scala-reflect",scalaVersion),
- JavaDependency("org.scala-lang","scala-compiler",scalaVersion)
+ MavenRepository.central.resolveOne(MavenDependency("org.scala-lang","scala-reflect",scalaVersion)),
+ MavenRepository.central.resolveOne(MavenDependency("org.scala-lang","scala-compiler",scalaVersion))
)
val scalaXml = Dependencies(
- JavaDependency("org.scala-lang.modules","scala-xml_"+scalaMajorVersion,scalaXmlVersion),
- JavaDependency("org.scala-lang","scala-library",scalaVersion)
+ MavenRepository.central.resolveOne(MavenDependency("org.scala-lang.modules","scala-xml_"+scalaMajorVersion,scalaXmlVersion)),
+ MavenRepository.central.resolveOne(MavenDependency("org.scala-lang","scala-library",scalaVersion))
)
- val zinc = JavaDependency("com.typesafe.zinc","zinc",zincVersion)
- println(zinc.dependencyTree)
+ val zinc = MavenRepository.central.resolveOne(MavenDependency("com.typesafe.zinc","zinc",zincVersion))
- def valName(dep: JavaDependency) = {
+ def valName(dep: BoundMavenDependency) = {
val words = dep.artifactId.split("_").head.split("-")
words(0) ++ words.drop(1).map(s => s(0).toString.toUpperCase ++ s.drop(1)).mkString ++ "_" ++ dep.version.replace(".","_") ++ "_"
}
- def vals(d: JavaDependency) = s""" """
-
- def jarVal(dep: JavaDependency) = "_" + valName(dep) +"Jar"
- def transitive(dep: Dependency) = (dep +: dep.transitiveDependencies.reverse).collect{case d: JavaDependency => d}
+ def jarVal(dep: BoundMavenDependency) = "_" + valName(dep) +"Jar"
+ def transitive(dep: Dependency) = (dep +: dep.transitiveDependencies.reverse).collect{case d: BoundMavenDependency => d}
def codeEach(dep: Dependency) = {
transitive(dep).tails.map(_.reverse).toVector.reverse.drop(1).map{
deps =>
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala
index eac78ea..39cc9e3 100644
--- a/stage2/BasicBuild.scala
+++ b/stage2/BasicBuild.scala
@@ -12,7 +12,7 @@ import scala.collection.immutable.Seq
import scala.util._
class BasicBuild( context: Context ) extends Build( context )
-class Build(val context: Context) extends Dependency with TriggerLoop{
+class Build(val context: Context) extends Dependency with TriggerLoop with SbtDependencyDsl{
// library available to builds
implicit final val logger: Logger = context.logger
implicit final val classLoaderCache: ClassLoaderCache = context.classLoaderCache
@@ -21,6 +21,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop{
// ========== general stuff ==========
+ override def canBeCached = false
def enableConcurrency = false
final def projectDirectory: File = lib.realpath(context.cwd)
assert( projectDirectory.exists, "projectDirectory does not exist: " ++ projectDirectory.string )
@@ -33,7 +34,9 @@ class Build(val context: Context) extends Dependency with TriggerLoop{
def zincVersion = "0.3.9"
def dependencies: Seq[Dependency] = Seq(
- "org.scala-lang" % "scala-library" % scalaVersion
+ MavenRepository.central.resolve(
+ "org.scala-lang" % "scala-library" % scalaVersion
+ )
)
// ========== paths ==========
@@ -85,22 +88,6 @@ class Build(val context: Context) extends Dependency with TriggerLoop{
scalaVersion: String = scalaMajorVersion
) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion )
- /** SBT-like dependency builder DSL for syntax compatibility */
- class DependencyBuilder2( groupId: String, artifactId: String, scalaVersion: Option[String] ){
- def %(version: String) = scalaVersion.map(
- v => ScalaDependency(groupId, artifactId, version, scalaVersion = v)
- ).getOrElse(
- JavaDependency(groupId, artifactId, version)
- )
- }
- implicit class DependencyBuilder(groupId: String){
- def %%(artifactId: String) = new DependencyBuilder2( groupId, artifactId, Some(scalaMajorVersion) )
- def %(artifactId: String) = new DependencyBuilder2( groupId, artifactId, None )
- }
- implicit class DependencyBuilder3(d: JavaDependency){
- def %(classifier: String) = d.copy(classifier = Classifier(Some(classifier)))
- }
-
final def BuildDependency(path: File) = cbt.BuildDependency(
context.copy( cwd = path, args = Seq() )
)
@@ -129,8 +116,8 @@ class Build(val context: Context) extends Dependency with TriggerLoop{
def needsUpdate: Boolean = needsUpdateCache(
context.cbtHasChanged
|| lib.needsUpdate( sourceFiles, compileStatusFile )
- || transitiveDependencies.exists(_.needsUpdate)
- )
+ || transitiveDependencies.exists(_.needsUpdate)
+ )
private object compileCache extends Cache[Option[File]]
def compile: Option[File] = compileCache{
diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala
index 9746d8c..45d86f8 100644
--- a/stage2/BuildBuild.scala
+++ b/stage2/BuildBuild.scala
@@ -5,7 +5,7 @@ import scala.collection.immutable.Seq
class BuildBuild(context: Context) extends Build(context){
override def dependencies = Seq( CbtDependency()(context.logger) ) ++ super.dependencies
def managedBuildDirectory: File = lib.realpath( projectDirectory.parent )
- val managedBuild = {
+ val managedBuild = try{
val managedContext = context.copy( cwd = managedBuildDirectory )
val cl = new cbt.URLClassLoader(
exportedClasspath,
@@ -16,6 +16,9 @@ class BuildBuild(context: Context) extends Build(context){
.getConstructor(classOf[Context])
.newInstance(managedContext)
.asInstanceOf[Build]
+ } catch {
+ case e: Exception =>
+ throw new Exception("during build: "+context.cwd, e)
}
override def triggerLoopFiles = super.triggerLoopFiles ++ managedBuild.triggerLoopFiles
override def finalBuild = managedBuild.finalBuild
diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala
index e3a01c7..19357f9 100644
--- a/stage2/BuildDependency.scala
+++ b/stage2/BuildDependency.scala
@@ -21,6 +21,7 @@ case class BuildDependency(context: Context) extends TriggerLoop{
final override lazy val lib: Lib = new Lib(logger)
private val root = lib.loadRoot( context.copy(args=Seq()) )
lazy val build = root.finalBuild
+ override def canBeCached = build.canBeCached
def exportedClasspath = ClassPath(Seq())
def exportedJars = Seq()
def dependencies = Seq(build)
diff --git a/stage2/GitDependency.scala b/stage2/GitDependency.scala
index aeeeead..27bf253 100644
--- a/stage2/GitDependency.scala
+++ b/stage2/GitDependency.scala
@@ -10,6 +10,7 @@ case class GitDependency(
)(implicit val logger: Logger, classLoaderCache: ClassLoaderCache, context: Context ) extends Dependency{
override def lib = new Lib(logger)
+ override def canBeCached = true
// TODO: add support for authentication via ssh and/or https
// See http://www.codeaffine.com/2014/12/09/jgit-authentication/
diff --git a/stage2/SbtDependencyDsl.scala b/stage2/SbtDependencyDsl.scala
new file mode 100644
index 0000000..4fd4250
--- /dev/null
+++ b/stage2/SbtDependencyDsl.scala
@@ -0,0 +1,43 @@
+package cbt
+trait SbtDependencyDsl{ self: Build =>
+ /** SBT-like dependency builder DSL for syntax compatibility */
+ class DependencyBuilder2( groupId: String, artifactId: String, scalaVersion: Option[String] ){
+ def %(version: String) = scalaVersion.map(
+ v => ScalaDependency(groupId, artifactId, version, scalaVersion = v)
+ ).getOrElse(
+ MavenDependency(groupId, artifactId, version)
+ )
+ }
+ implicit class DependencyBuilder(groupId: String){
+ def %%(artifactId: String) = new DependencyBuilder2( groupId, artifactId, Some(scalaMajorVersion) )
+ def %(artifactId: String) = new DependencyBuilder2( groupId, artifactId, None )
+ }
+ implicit class DependencyBuilder3(d: MavenDependency){
+ def %(classifier: String) = d.copy(classifier = Classifier(Some(classifier)))
+ }
+
+ /*
+ /** SBT-like dependency builder DSL for syntax compatibility */
+ implicit class DependencyBuilder0(repository: Maven){
+ def %(groupId: String) = new DependencyBuilder1b(repository, groupId)
+ }
+ implicit class DependencyBuilder1a(groupId: String){
+ def %%(artifactId: String) = new DependencyBuilder2( Maven.central, groupId, artifactId, Some(scalaMajorVersion) )
+ def %(artifactId: String) = new DependencyBuilder2( Maven.central, groupId, artifactId, None )
+ }
+ class DependencyBuilder1b(repository: Maven, groupId: String){
+ def %%(artifactId: String) = new DependencyBuilder2( repository, groupId, artifactId, Some(scalaMajorVersion) )
+ def %(artifactId: String) = new DependencyBuilder2( repository, groupId, artifactId, None )
+ }
+ class DependencyBuilder2( repository: Maven, groupId: String, artifactId: String, scalaMajorVersion: Option[String] ){
+ def %(version: String) = scalaMajorVersion.map(
+ v => repository(groupId, artifactId, version, scalaMajorVersion = v)
+ ).getOrElse(
+ repository.java(groupId, artifactId, version)
+ )
+ }
+ implicit class DependencyBuilder3(d: MavenDependency){
+ def %(classifier: String) = d.copy(classifier = Classifier(Some(classifier)))
+ }
+ */
+} \ No newline at end of file
diff --git a/stage2/mixins.scala b/stage2/mixins.scala
index c3a57da..4dedd09 100644
--- a/stage2/mixins.scala
+++ b/stage2/mixins.scala
@@ -16,9 +16,9 @@ trait SbtTest extends Test{
trait ScalaTest extends Build with Test{
def scalaTestVersion: String
- override def dependencies = Seq(
+ override def dependencies = super.dependencies :+ MavenRepository.central.resolve(
"org.scalatest" %% "scalatest" % scalaTestVersion
- ) ++ super.dependencies
+ )
override def run: ExitCode = {
val discoveryPath = compile.toString++"/"
diff --git a/test/simple/build/build.scala b/test/simple/build/build.scala
index d3887b3..190bad9 100644
--- a/test/simple/build/build.scala
+++ b/test/simple/build/build.scala
@@ -1,14 +1,30 @@
import cbt._
import scala.collection.immutable.Seq
import java.io.File
+
class Build(context: cbt.Context) extends BasicBuild(context){
- override def dependencies = Seq(
- ScalaDependency("com.typesafe.play", "play-json", "2.4.4"),
- JavaDependency("joda-time", "joda-time", "2.9.2"),
- GitDependency("https://github.com/xdotai/diff.git", "2e275642041006ff39efde22da7742c2e9a0f63f"),
- // the below tests pom inheritance with dependencyManagement and variable substitution for pom properties
- JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
- // the below tests pom inheritance with variable substitution for pom xml tag contents
- JavaDependency("com.spotify", "missinglink-core", "0.1.1")
- ) ++ super.dependencies
+ override def dependencies = (
+ super.dependencies
+ ++
+ Seq(
+ GitDependency("https://github.com/xdotai/diff.git", "8b501902999fe76d49e04937c4bd6d0b9e07b4a6"),
+ MavenRepository.central.resolve(
+ ScalaDependency("com.typesafe.play", "play-json", "2.4.4"),
+ MavenDependency("joda-time", "joda-time", "2.9.2"),
+ // the below tests pom inheritance with dependencyManagement and variable substitution for pom properties
+ MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
+ // the below tests pom inheritance with variable substitution for pom xml tag contents
+ MavenDependency("com.spotify", "missinglink-core", "0.1.1")
+ ),
+ MavenRepository.combine(
+ MavenRepository.central,
+ MavenRepository.bintray("tpolecat"),
+ MavenRepository.sonatypeSnapshots
+ ).resolve(
+ "org.cvogt" %% "play-json-extensions" % "0.8.0",
+ "org.tpolecat" %% "tut-core" % "0.4.2",
+ "ai.x" %% "lens" % "1.0.0-SNAPSHOT"
+ )
+ )
+ )
}
diff --git a/test/test.scala b/test/test.scala
index 811e619..2c4f391 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -1,12 +1,14 @@
import cbt._
import cbt.paths._
import scala.collection.immutable.Seq
+import java.io.File
// micro framework
object Main{
def main(_args: Array[String]): Unit = {
val args = new Stage1ArgsParser(_args.toVector)
implicit val logger: Logger = new Logger(args.enabledLoggers)
+ val lib = new Lib(logger)
var successes = 0
var failures = 0
@@ -69,19 +71,14 @@ object Main{
logger.test( "Running tests " ++ _args.toList.toString )
- usage("nothing")
- compile("nothing")
- usage("multi-build")
- compile("multi-build")
- usage("simple")
- compile("simple")
-
{
val noContext = Context(cbtHome ++ "/test/nothing", Seq(), logger, false, new ClassLoaderCache(logger))
val b = new Build(noContext){
override def dependencies = Seq(
- JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
- JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0")
+ MavenRepository.central.resolve(
+ MavenDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
+ MavenDependency("net.incongru.watchservice","barbary-watchservice","1.0")
+ )
)
}
val cp = b.classpath
@@ -90,22 +87,48 @@ object Main{
// test that messed up artifacts crash with an assertion (which should tell the user what's up)
assertException[AssertionError](){
- JavaDependency("com.jcraft", "jsch", " 0.1.53").classpath
+ MavenRepository.central.resolveOne( MavenDependency("com.jcraft", "jsch", " 0.1.53") ).classpath
}
assertException[AssertionError](){
- JavaDependency("com.jcraft", null, "0.1.53").classpath
+ MavenRepository.central.resolveOne( MavenDependency("com.jcraft", null, "0.1.53") ).classpath
}
assertException[AssertionError](){
- JavaDependency("com.jcraft", "", " 0.1.53").classpath
+ MavenRepository.central.resolveOne( MavenDependency("com.jcraft", "", " 0.1.53") ).classpath
}
assertException[AssertionError](){
- JavaDependency("com.jcraft%", "jsch", " 0.1.53").classpath
+ MavenRepository.central.resolveOne( MavenDependency("com.jcraft%", "jsch", " 0.1.53") ).classpath
}
assertException[AssertionError](){
- JavaDependency("", "jsch", " 0.1.53").classpath
+ MavenRepository.central.resolveOne( MavenDependency("", "jsch", " 0.1.53") ).classpath
}
-
+ (
+ MavenRepository.combine(
+ MavenRepository.central, MavenRepository.bintray("tpolecat")
+ ).resolve(
+ lib.ScalaDependency("org.tpolecat","tut-core","0.4.2", scalaMajorVersion="2.11")
+ ).classpath.strings
+ ++
+ MavenRepository.sonatype.resolve(
+ MavenDependency("org.cvogt","play-json-extensions_2.11","0.8.0")
+ ).classpath.strings
+ ++
+ MavenRepository.combine(
+ MavenRepository.central, MavenRepository.sonatypeSnapshots
+ ).resolve(
+ MavenDependency("ai.x","lens_2.11","1.0.0-SNAPSHOT")
+ ).classpath.strings
+ ).foreach{
+ path => assert(new File(path).exists, path)
+ }
+
+ usage("nothing")
+ compile("nothing")
+ usage("multi-build")
+ compile("multi-build")
+ usage("simple")
+ compile("simple")
+
System.err.println(" DONE!")
System.err.println( successes.toString ++ " succeeded, "++ failures.toString ++ " failed" )
if(failures > 0) System.exit(1) else System.exit(0)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 09:29:44 +0000