From 7010cef2a57d9d06c59feed3771c2294f76b1383 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 15 May 2011 09:50:14 -0700 Subject: [PATCH] Made simple a lot simpler. --- bin/sbt-setup | 34 +++++++++++------ project/build.properties | 2 +- .../resources/{support.scala => fancy.scala} | 6 ++- src/main/resources/simple.scala | 37 +++++++++++++++++++ 4 files changed, 64 insertions(+), 15 deletions(-) rename src/main/resources/{support.scala => fancy.scala} (92%) create mode 100644 src/main/resources/simple.scala diff --git a/bin/sbt-setup b/bin/sbt-setup index 92387bb30..547df317d 100755 --- a/bin/sbt-setup +++ b/bin/sbt-setup @@ -1,13 +1,23 @@ #!/usr/bin/env bash # -BINDIR=$(dirname $(greadlink "$0")) +function programDir () { + SDIR=$(dirname "$1"); + echo $(cd $SDIR ; pwd -P) +} + +if [ -h "$0" ]; then + BINDIR=$(programDir $(greadlink "$0")) +else + BINDIR=$(programDir "$0") +fi + . $BINDIR/util.sh BASE=$(abspath $BINDIR/..) declare -a args TEMPLATE="simple" -SCALA_VERSION="2.8.1" + SCALA_VERSION="2.9.0" PROJECT_VERSION="0.0.1" DO_GITHUB= @@ -35,7 +45,7 @@ while [ $# -gt 0 ]; do shift ;; --29) - SCALA_VERSION="2.9.0.RC1" + SCALA_VERSION="2.9.0" shift ;; *) @@ -71,7 +81,7 @@ fi PROJECT="$1" PACKAGE=${ORGANIZATION:-template} -SBT_VERSION="0.7.6.RC0" +SBT_VERSION="0.7.7" DIR=$(echo ${PROJECT} | tr '[A-Z]' '[a-z]') PROJECT_CC=`camelCase ${PROJECT}` PROJECT_CLASS=${PROJECT_CC}Project @@ -102,13 +112,13 @@ build.scala.versions=$SCALA_VERSION project.initialize=false EOF -cat > src/main/scala/Main.scala < src/main/scala/Main.scala < src/test/scala/${SPEC_CLASS}.scala <> $FILE + cat $BASE/src/main/resources/$TEMPLATE.scala >> $FILE cp $BASE/src/template/Plugins.scala project/plugins fi diff --git a/project/build.properties b/project/build.properties index df961e0db..34584f137 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,7 +2,7 @@ #Generated by sbt-setup on Sat Apr 2 18:11:54 PDT 2011 project.organization=improving project.name=sbt-template -sbt.version=0.7.6.RC0 +sbt.version=0.7.7 project.version=0.0.1 build.scala.versions=2.8.1 project.initialize=false diff --git a/src/main/resources/support.scala b/src/main/resources/fancy.scala similarity index 92% rename from src/main/resources/support.scala rename to src/main/resources/fancy.scala index 4395259a4..293cfd238 100644 --- a/src/main/resources/support.scala +++ b/src/main/resources/fancy.scala @@ -15,14 +15,16 @@ trait ProjectSupport extends ModuleIdDynamifactory { val sonatype = "Sonatype" at "https://oss.sonatype.org/content/groups/public" val scalaToolsSnapshots = "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots/" val jboss = "JBoss Repo" at "http://repository.jboss.org/maven2" + // val akkaReleases = "Akka Maven Repository" at "http://scalablesolutions.se/akka/repository" private val testConfig: ArtifactConfig = ArtifactConfig( ArtifactRevision(_ => dynamicRevision), ArtifactTransform(inScope("test"), withSources) ) /*** Libraries ***/ - val specs: ModuleID = testConfig("org.scala-tools.testing" %% "specs") - val scalacheck: ModuleID = testConfig("org.scala-tools.testing" %% "scalacheck") + // val specs: ModuleID = testConfig("org.scala-tools.testing" %% "specs") + // val specs2: ModuleID = testConfig("org.specs2" %% "specs2") + // val scalacheck: ModuleID = testConfig("org.scala-tools.testing" %% "scalacheck") private implicit lazy val implicitTransform: ArtifactTransform = ArtifactTransform() diff --git a/src/main/resources/simple.scala b/src/main/resources/simple.scala new file mode 100644 index 000000000..77dab5f01 --- /dev/null +++ b/src/main/resources/simple.scala @@ -0,0 +1,37 @@ + +trait ProjectSupport { + self: DefaultProject => + + /** Repositories. Comment in or out to taste. + */ + val localMaven = "Local Maven" at "file://"+Path.userHome+"/.m2/repository" + val localIvy = "Local Ivy" at "file://"+Path.userHome+"/.ivy2/local" + val sonatype = "Sonatype" at "https://oss.sonatype.org/content/groups/public" + val scalaToolsSnapshots = "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots/" + val jboss = "JBoss Repo" at "http://repository.jboss.org/maven2" + // val akkaReleases = "Akka Maven Repository" at "http://scalablesolutions.se/akka/repository" + + /*** Libraries ***/ + val specs: ModuleID = "org.scala-tools.testing" %% "specs" % "1.6.8" + val scalacheck: ModuleID = "org.scala-tools.testing" %% "scalacheck" % "1.9" + // val specs2: ModuleID = testConfig("org.specs2" %% "specs2") + // val ant: ModuleID = "org.apache.ant" % "ant" + // val jdt: ModuleID = "org.eclipse.jdt" % "core" notTransitive() + // val scalaImproving: ModuleID = "org.improving" %% "scala-improving" + // val scalaSTM: ModuleID = "org.scala-tools" %% "scala-stm" + // val scalariform: ModuleID = "org.scalariform" %% "scalariform" + // + // val asmAll: ModuleID = "asm" % "asm-all" % "3.3.1" withSources() + // val easymock: ModuleID = "org.easymock" % "easymock" + // val guava: ModuleID = "com.google.guava" % "guava" + // val ivy: ModuleID = "org.apache.ivy" % "ivy" + // val jetty: ModuleID = "org.mortbay.jetty" % "jetty" + // val jmock: ModuleID = "org.jmock" % "jmock" + // val jodaTime: ModuleID = "joda-time" % "joda-time" + // val liftJson: ModuleID = "net.liftweb" %% "lift-json" + // val maven: ModuleID = "org.apache.maven" % "maven-ant-tasks" + // val scalaARM: ModuleID = "com.github.jsuereth.scala-arm" %% "scala-arm" withSources() + // val scalazCore: ModuleID = "org.scalaz" %% "scalaz-core" withSources() + // val scalazHttp: ModuleID = "org.scalaz" %% "scalaz-http" withSources() + // val slf4s: ModuleID = "com.weiglewilczek.slf4s" %% "slf4s" withSources() +}