Permalink
Browse files

Some small changes and fixes.

  • Loading branch information...
1 parent bafb827 commit 7a9084deb68e19381c8d6b84ab7a25633afffa9f @analytically committed Jun 19, 2013
Showing with 32 additions and 22 deletions.
  1. +28 −16 .gitignore
  2. +1 −2 project/Build.scala
  3. +1 −1 project/plugins.sbt
  4. +1 −2 sample/project/Build.scala
  5. +1 −1 sample/project/build.properties
View
44 .gitignore
@@ -1,17 +1,29 @@
-# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
-# Ignore all dotfiles...
-.*
-# except for .gitignore and .travis.yml
-!.gitignore
-!.travis.yml
+# SBT
+boot/
+lib_managed/
+src_managed/
+test-output/
+target/
+.history
-# Ignore Play! working directory #
-db
-eclipse
-log
-logs
-precompiled
-tmp
-test-result
-eclipse
-server.pid
+# IntelliJ
+.idea/
+.idea_modules/
+*.iml
+*.ipr
+*.iws
+out/
+
+# Eclipse
+.cache
+.classpath
+.project
+.scala_dependencies
+.settings
+.target/
+
+# Mac
+.DS_Store
+
+# Other
+*.pyc
View
3 project/Build.scala
@@ -13,15 +13,14 @@ object Build extends sbt.Build {
description := "Unofficial Capsule CRM API Java Client",
startYear := Some(2011),
resolvers += Resolver.typesafeRepo("releases"),
- scalaVersion := "2.10.1",
+ scalaVersion := "2.10.2",
parallelExecution in Test := false,
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v"),
libraryDependencies += "play" %% "play-java" % playVersion,
libraryDependencies += "com.thoughtworks.xstream" % "xstream" % "1.4.4",
// testing
libraryDependencies += "play" %% "play-test" % playVersion % "test",
- libraryDependencies += "org.specs2" %% "specs2" % "1.14" % "test",
libraryDependencies += "org.jsoup" % "jsoup" % "1.7.2" % "test",
libraryDependencies += "com.novocode" % "junit-interface" % "0.10-M4" % "test",
View
2 project/plugins.sbt
@@ -1,6 +1,6 @@
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0")
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.0")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.1")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.3")
View
3 sample/project/Build.scala
@@ -9,8 +9,7 @@ object ApplicationBuild extends Build {
val appDependencies = Seq(
javaCore,
- "com.thoughtworks.xstream" % "xstream" % "1.4.4",
- "uk.co.coen" % "capsulecrm-java" % "1.0.1"
+ "uk.co.coen" % "capsulecrm-java" % "1.0.2"
)
val main = play.Project(appName, appVersion, appDependencies).settings(
View
2 sample/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.12.2

0 comments on commit 7a9084d

Please sign in to comment.