From feb7c0dc102be3c9f142c4832f821d65d61cec95 Mon Sep 17 00:00:00 2001 From: dmharrah Date: Fri, 25 Sep 2009 13:11:54 +0000 Subject: [PATCH] Test for inline Ivy module configurations git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1048 d89573ee-9141-11dd-94d4-bdf5e562f29c --- .../module-confs/changes/WrongOrg.scala | 14 +++++++++++ .../module-confs/changes/WrongPattern.scala | 14 +++++++++++ .../module-confs/changes/WrongVersion.scala | 14 +++++++++++ .../module-confs/project/build.properties | 2 ++ .../module-confs/project/build/Test.scala | 14 +++++++++++ .../dependency-management/module-confs/test | 25 +++++++++++++++++++ 6 files changed, 83 insertions(+) create mode 100644 src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala create mode 100644 src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala create mode 100644 src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala create mode 100644 src/sbt-test/dependency-management/module-confs/project/build.properties create mode 100644 src/sbt-test/dependency-management/module-confs/project/build/Test.scala create mode 100644 src/sbt-test/dependency-management/module-confs/test diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala new file mode 100644 index 000000000..52240e06a --- /dev/null +++ b/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala @@ -0,0 +1,14 @@ +import sbt._ + +class Test(info: ProjectInfo) extends DefaultProject(info) +{ + def ivyCacheDirectory = outputPath / "ivy-cache" + override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList + + def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]" + def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() + val scOnly = ModuleConfiguration("org.not-scala-lang", "*", "2.8.0-.*", scalaSnapshots) + + val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219" + val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3" +} \ No newline at end of file diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala new file mode 100644 index 000000000..4fc451b24 --- /dev/null +++ b/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala @@ -0,0 +1,14 @@ +import sbt._ + +class Test(info: ProjectInfo) extends DefaultProject(info) +{ + def ivyCacheDirectory = outputPath / "ivy-cache" + override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList + + def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.a-SNAPSHOT/[artifact]-[revision].[ext]" + def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() + val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots) + + val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219" + val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3" +} \ No newline at end of file diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala new file mode 100644 index 000000000..4ac6d5a3e --- /dev/null +++ b/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala @@ -0,0 +1,14 @@ +import sbt._ + +class Test(info: ProjectInfo) extends DefaultProject(info) +{ + def ivyCacheDirectory = outputPath / "ivy-cache" + override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList + + def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]" + def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() + val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots) + + val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-218" + val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3" +} \ No newline at end of file diff --git a/src/sbt-test/dependency-management/module-confs/project/build.properties b/src/sbt-test/dependency-management/module-confs/project/build.properties new file mode 100644 index 000000000..c6df3d9ce --- /dev/null +++ b/src/sbt-test/dependency-management/module-confs/project/build.properties @@ -0,0 +1,2 @@ +project.name=Test Module Configurations +project.version=1.0 \ No newline at end of file diff --git a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala new file mode 100644 index 000000000..a19879906 --- /dev/null +++ b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala @@ -0,0 +1,14 @@ +import sbt._ + +class Test(info: ProjectInfo) extends DefaultProject(info) +{ + def ivyCacheDirectory = outputPath / "ivy-cache" + override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList + + def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]" + def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle() + val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots) + + val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219" + val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3" +} \ No newline at end of file diff --git a/src/sbt-test/dependency-management/module-confs/test b/src/sbt-test/dependency-management/module-confs/test new file mode 100644 index 000000000..251e67e51 --- /dev/null +++ b/src/sbt-test/dependency-management/module-confs/test @@ -0,0 +1,25 @@ +> update +[success] +> clean +[success] + +$ copy-file changes/WrongOrg.scala project/build/Test.scala +[success] +$ reload +[success] +> update +[failure] + +$ copy-file changes/WrongVersion.scala project/build/Test.scala +[success] +$ reload +[success] +> update +[failure] + +$ copy-file changes/WrongPattern.scala project/build/Test.scala +[success] +$ reload +[success] +> update +[failure]