From f41cc8071c8b3ccbfc8931fdc52e57cff4325be0 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 27 Sep 2013 15:37:06 -0400 Subject: [PATCH] move examples to a Scala directory so it's easy to add others --- examples/{ => scala}/complex-app/build.sbt | 0 .../src/main/resources/complex1.conf | 0 .../src/main/resources/complex2.conf | 0 .../src/main/scala/ComplexApp.scala | 0 examples/{ => scala}/simple-app/build.sbt | 0 .../src/main/resources/application.conf | 0 .../simple-app/src/main/scala/SimpleApp.scala | 0 examples/{ => scala}/simple-lib/build.sbt | 0 .../src/main/resources/reference.conf | 0 .../src/main/scala/simplelib/SimpleLib.scala | 0 project/Build.scala | 20 +++++++++---------- 11 files changed, 10 insertions(+), 10 deletions(-) rename examples/{ => scala}/complex-app/build.sbt (100%) rename examples/{ => scala}/complex-app/src/main/resources/complex1.conf (100%) rename examples/{ => scala}/complex-app/src/main/resources/complex2.conf (100%) rename examples/{ => scala}/complex-app/src/main/scala/ComplexApp.scala (100%) rename examples/{ => scala}/simple-app/build.sbt (100%) rename examples/{ => scala}/simple-app/src/main/resources/application.conf (100%) rename examples/{ => scala}/simple-app/src/main/scala/SimpleApp.scala (100%) rename examples/{ => scala}/simple-lib/build.sbt (100%) rename examples/{ => scala}/simple-lib/src/main/resources/reference.conf (100%) rename examples/{ => scala}/simple-lib/src/main/scala/simplelib/SimpleLib.scala (100%) diff --git a/examples/complex-app/build.sbt b/examples/scala/complex-app/build.sbt similarity index 100% rename from examples/complex-app/build.sbt rename to examples/scala/complex-app/build.sbt diff --git a/examples/complex-app/src/main/resources/complex1.conf b/examples/scala/complex-app/src/main/resources/complex1.conf similarity index 100% rename from examples/complex-app/src/main/resources/complex1.conf rename to examples/scala/complex-app/src/main/resources/complex1.conf diff --git a/examples/complex-app/src/main/resources/complex2.conf b/examples/scala/complex-app/src/main/resources/complex2.conf similarity index 100% rename from examples/complex-app/src/main/resources/complex2.conf rename to examples/scala/complex-app/src/main/resources/complex2.conf diff --git a/examples/complex-app/src/main/scala/ComplexApp.scala b/examples/scala/complex-app/src/main/scala/ComplexApp.scala similarity index 100% rename from examples/complex-app/src/main/scala/ComplexApp.scala rename to examples/scala/complex-app/src/main/scala/ComplexApp.scala diff --git a/examples/simple-app/build.sbt b/examples/scala/simple-app/build.sbt similarity index 100% rename from examples/simple-app/build.sbt rename to examples/scala/simple-app/build.sbt diff --git a/examples/simple-app/src/main/resources/application.conf b/examples/scala/simple-app/src/main/resources/application.conf similarity index 100% rename from examples/simple-app/src/main/resources/application.conf rename to examples/scala/simple-app/src/main/resources/application.conf diff --git a/examples/simple-app/src/main/scala/SimpleApp.scala b/examples/scala/simple-app/src/main/scala/SimpleApp.scala similarity index 100% rename from examples/simple-app/src/main/scala/SimpleApp.scala rename to examples/scala/simple-app/src/main/scala/SimpleApp.scala diff --git a/examples/simple-lib/build.sbt b/examples/scala/simple-lib/build.sbt similarity index 100% rename from examples/simple-lib/build.sbt rename to examples/scala/simple-lib/build.sbt diff --git a/examples/simple-lib/src/main/resources/reference.conf b/examples/scala/simple-lib/src/main/resources/reference.conf similarity index 100% rename from examples/simple-lib/src/main/resources/reference.conf rename to examples/scala/simple-lib/src/main/resources/reference.conf diff --git a/examples/simple-lib/src/main/scala/simplelib/SimpleLib.scala b/examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala similarity index 100% rename from examples/simple-lib/src/main/scala/simplelib/SimpleLib.scala rename to examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala diff --git a/project/Build.scala b/project/Build.scala index 511f2655..a9260c26 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -26,7 +26,7 @@ object ConfigBuild extends Build { lazy val root = Project(id = "root", base = file("."), - settings = Project.defaultSettings ++ unpublished) aggregate(testLib, configLib, simpleLib, simpleApp) + settings = Project.defaultSettings ++ unpublished) aggregate(testLib, configLib, simpleLibScala, simpleAppScala, complexAppScala) lazy val configLib = Project(id = "config", base = file("config"), @@ -44,17 +44,17 @@ object ConfigBuild extends Build { base = file("test-lib"), settings = Project.defaultSettings ++ unpublished) - lazy val simpleLib = Project(id = "simple-lib", - base = file("examples/simple-lib"), - settings = Project.defaultSettings ++ unpublished) dependsOn(configLib) + lazy val simpleLibScala = Project(id = "simple-lib", + base = file("examples/scala/simple-lib"), + settings = Project.defaultSettings ++ unpublished) dependsOn(configLib) - lazy val simpleApp = Project(id = "simple-app", - base = file("examples/simple-app"), - settings = Project.defaultSettings ++ unpublished) dependsOn(simpleLib) + lazy val simpleAppScala = Project(id = "simple-app", + base = file("examples/scala/simple-app"), + settings = Project.defaultSettings ++ unpublished) dependsOn(simpleLibScala) - lazy val complexApp = Project(id = "complex-app", - base = file("examples/complex-app"), - settings = Project.defaultSettings ++ unpublished) dependsOn(simpleLib) + lazy val complexAppScala = Project(id = "complex-app", + base = file("examples/scala/complex-app"), + settings = Project.defaultSettings ++ unpublished) dependsOn(simpleLibScala) } // from https://raw.github.com/paulp/scala-improving/master/project/PublishToSonatype.scala