Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Edit build files and readmes to require sbt 0.13.0 + Scala 2.10.3

  • Loading branch information...
commit b6196074b47a6593fd9fc820a506f4b5bf52ce4a 1 parent b058a8b
@ochafik ochafik authored
Showing with 51 additions and 49 deletions.
  1. +2 −2 Beans/README.md
  2. +1 −1  Compilets/DefaultCompilets/project/build.properties
  3. +1 −1  Compilets/Examples/CustomCompilets/Usage/build.sbt
  4. +1 −1  Compilets/Examples/CustomCompilets/Usage/project/build.properties
  5. +1 −1  Compilets/Examples/CustomCompilets/build.sbt
  6. +1 −1  Compilets/Examples/CustomCompilets/project/build.properties
  7. +1 −1  Compilets/Examples/DSLWithOptimizingCompilets/Usage/build.sbt
  8. +1 −1  Compilets/Examples/DSLWithOptimizingCompilets/Usage/project/build.properties
  9. +1 −1  Compilets/Examples/DSLWithOptimizingCompilets/build.sbt
  10. +1 −1  Compilets/Examples/DSLWithOptimizingCompilets/project/build.properties
  11. +1 −1  Compilets/Examples/UsageWithMavenOrWithoutSbtPlugin/build.sbt
  12. +1 −1  Compilets/Examples/UsageWithMavenOrWithoutSbtPlugin/project/build.properties
  13. +1 −1  Compilets/Examples/UsageWithSbtPlugin/build.sbt
  14. +1 −1  Compilets/Examples/UsageWithSbtPlugin/project/build.properties
  15. +3 −3 Compilets/README.md
  16. +2 −2 Debug/README.md
  17. +1 −1  Fx/Example/Plots/build.sbt
  18. +1 −1  Fx/Example/build.sbt
  19. +2 −2 Fx/README.md
  20. +2 −2 JSON/README.md
  21. +1 −1  Loops/Benchmarks/build.sbt
  22. +1 −1  Loops/Benchmarks/project/build.properties
  23. +2 −2 Loops/README.md
  24. +2 −2 MacroExtensions/README.md
  25. +1 −1  MacroExtensions/examples/Complex/Library/build.sbt
  26. +1 −1  MacroExtensions/examples/Complex/build.sbt
  27. +1 −1  MacroExtensions/examples/Generics/Library/build.sbt
  28. +1 −1  MacroExtensions/examples/Generics/build.sbt
  29. +1 −1  MacroExtensions/examples/Generics/project/build.properties
  30. +1 −1  Parano/README.md
  31. +1 −1  Parano/examples/build.sbt
  32. +1 −1  README.md
  33. +2 −2 Reified/README.md
  34. +3 −3 project/ScalaxyBuild.scala
  35. +1 −1  project/build.properties
  36. +5 −3 project/plugins.sbt
View
4 Beans/README.md
@@ -24,10 +24,10 @@ Only downside: code completion won't work in IDE (unless someone adds a special
# Usage
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Dependency at compilation-time only (not at runtime).
libraryDependencies += "com.nativelibs4java" %% "scalaxy-beans" % "0.3-SNAPSHOT" % "provided"
View
2  Compilets/DefaultCompilets/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.0
View
2  Compilets/Examples/CustomCompilets/Usage/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
autoCompilets := true
View
2  Compilets/Examples/CustomCompilets/Usage/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0
View
2  Compilets/Examples/CustomCompilets/build.sbt
@@ -4,7 +4,7 @@ organization := "com.nativelibs4java"
version := "1.0-SNAPSHOT"
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
scalaxyCompilets := true
View
2  Compilets/Examples/CustomCompilets/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.0
View
2  Compilets/Examples/DSLWithOptimizingCompilets/Usage/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
autoCompilets := true
View
2  Compilets/Examples/DSLWithOptimizingCompilets/Usage/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.0
View
2  Compilets/Examples/DSLWithOptimizingCompilets/build.sbt
@@ -4,7 +4,7 @@ organization := "com.nativelibs4java"
version := "1.0-SNAPSHOT"
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Tell sbt-scalaxy that we're defining compilets in this project (that will add all the dependencies we need, including for tests).
scalaxyCompilets := true
View
2  Compilets/Examples/DSLWithOptimizingCompilets/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.0
View
2  Compilets/Examples/UsageWithMavenOrWithoutSbtPlugin/build.sbt
@@ -4,7 +4,7 @@ organization := "com.nativelibs4java"
version := "1.0-SNAPSHOT"
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
resolvers += Resolver.sonatypeRepo("snapshots")
View
2  Compilets/Examples/UsageWithMavenOrWithoutSbtPlugin/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.0
View
2  Compilets/Examples/UsageWithSbtPlugin/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// If any library dependency includes a compilet, it will be automatically detected and used.
// If this is not set, compilets must be added explicitly with:
View
2  Compilets/Examples/UsageWithSbtPlugin/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1
+sbt.version=0.13.0
View
6 Compilets/README.md
@@ -8,7 +8,7 @@
# Usage
-The preferred way to use Scalaxy/Compilets is with Sbt 0.12.2 and the [sbt-scalaxy](http://github.com/ochafik/sbt-scalaxy) Sbt plugin, but the `Examples` subfolder demonstrates how to use it [with Maven or with Sbt but without `sbt-scalaxy`](https://github.com/ochafik/Scalaxy/tree/master/Examples/UsageWithMavenOrWithoutSbtPlugin).
+The preferred way to use Scalaxy/Compilets is with Sbt 0.13.0 and the [sbt-scalaxy](http://github.com/ochafik/sbt-scalaxy) Sbt plugin, but the `Examples` subfolder demonstrates how to use it [with Maven or with Sbt but without `sbt-scalaxy`](https://github.com/ochafik/Scalaxy/tree/master/Examples/UsageWithMavenOrWithoutSbtPlugin).
To compile your Sbt project with Scalaxy's compiler plugin and default compilets:
* Put the following in `project/plugins.sbt` (or in `~/.sbt/plugins/build.sbt` for global setup):
@@ -22,7 +22,7 @@ To compile your Sbt project with Scalaxy's compiler plugin and default compilets
* Make your `build.sbt` look like this:
```scala
- scalaVersion := "2.10.0"
+ scalaVersion := "2.10.3"
autoCompilets := true
@@ -93,7 +93,7 @@ Here's how to run tests:
sbt clean test
-To deploy to Sonatype (assuming ~/.sbt/0.12.2/sonatype.sbt contains the correct credentials), then advertise a release on ls.implicit.ly:
+To deploy to Sonatype (assuming ~/.sbt/0.13/sonatype.sbt contains the correct credentials), then advertise a release on ls.implicit.ly:
sbt "+ assembly" "+ publish"
sbt "project scalaxy" ls-write-version lsync
View
4 Debug/README.md
@@ -38,10 +38,10 @@ If you knew about `assert` but unsure what `assume` and `require` are, please [A
# Usage
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Dependency at compilation-time only (not at runtime).
libraryDependencies += "com.nativelibs4java" %% "scalaxy-debug" % "0.3-SNAPSHOT" % "provided"
View
2  Fx/Example/Plots/build.sbt
@@ -1,5 +1,5 @@
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Add JavaFX Runtime as an unmanaged dependency, hoping to find it in the JRE's library folder.
unmanagedJars in Compile ++= Seq(new File(System.getProperty("java.home")) / "lib" / "jfxrt.jar")
View
2  Fx/Example/build.sbt
@@ -5,7 +5,7 @@ name := "scalaxy-fx-example"
version := "1.0-SNAPSHOT"
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Add JavaFX Runtime as an unmanaged dependency, hoping to find it in the JRE's library folder.
unmanagedJars in Compile ++= Seq(new File(System.getProperty("java.home")) / "lib" / "jfxrt.jar")
View
4 Fx/README.md
@@ -70,11 +70,11 @@ class HelloWorld extends Application {
# Usage
-To use with `sbt` 0.12.2+, please have a look at the [HelloWorld example](https://github.com/ochafik/Scalaxy/blob/master/Fx/Example) and make your `build.sbt` file look like:
+To use with `sbt` 0.13.0+, please have a look at the [HelloWorld example](https://github.com/ochafik/Scalaxy/blob/master/Fx/Example) and make your `build.sbt` file look like:
```scala
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Add JavaFX Runtime as an unmanaged dependency, hoping to find it in the JRE's library folder.
unmanagedJars in Compile ++= Seq(new File(System.getProperty("java.home")) / "lib" / "jfxrt.jar")
View
4 JSON/README.md
@@ -53,10 +53,10 @@ For more examples, [have a look at the tests](https://github.com/ochafik/Scalaxy
# Usage
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Dependency at compilation-time only (not at runtime).
libraryDependencies += "com.nativelibs4java" %% "scalaxy-json" % "0.3-SNAPSHOT" % "provided"
View
2  Loops/Benchmarks/build.sbt
@@ -5,7 +5,7 @@ name := "scalaxy-loops-test"
version := "1.0-SNAPSHOT"
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Dependency at compilation-time only (not at runtime).
libraryDependencies += "com.nativelibs4java" %% "scalaxy-loops" % "0.3-SNAPSHOT" % "provided"
View
2  Loops/Benchmarks/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0
View
4 Loops/README.md
@@ -32,10 +32,10 @@ This is a rejuvenation of some code initially written for [ScalaCL](http://scala
# Usage with Sbt
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Dependency at compilation-time only (not at runtime).
libraryDependencies += "com.nativelibs4java" %% "scalaxy-loops" % "0.3-SNAPSHOT" % "provided"
View
4 MacroExtensions/README.md
@@ -65,10 +65,10 @@ object scalaxy$extensions$str2$1 {
# Usage
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
autoCompilerPlugins := true
View
2  MacroExtensions/examples/Complex/Library/build.sbt
@@ -1,5 +1,5 @@
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
autoCompilerPlugins := true
View
2  MacroExtensions/examples/Complex/build.sbt
@@ -1,5 +1,5 @@
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Uncomment this to see what's happening:
//scalacOptions ++= Seq("-Xprint:parser", "-Xprint:refchecks")
View
2  MacroExtensions/examples/Generics/Library/build.sbt
@@ -1,5 +1,5 @@
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
autoCompilerPlugins := true
View
2  MacroExtensions/examples/Generics/build.sbt
@@ -1,5 +1,5 @@
// Only works with 2.10.0+
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
// Uncomment this to see what's happening:
scalacOptions ++= Seq("-Xprint:parser", "-Xprint:refchecks")
View
2  MacroExtensions/examples/Generics/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.2
+sbt.version=0.13.0
View
2  Parano/README.md
@@ -29,7 +29,7 @@ val foo5 = Foo(theSecond, first) // Error: ident theSecond used for param th
# Usage
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
scalaVersion := "2.10.3"
View
2  Parano/examples/build.sbt
@@ -1,5 +1,5 @@
// Only works with 2.10.2+
-scalaVersion := "2.10.2"
+scalaVersion := "2.10.3"
autoCompilerPlugins := true
View
2  README.md
@@ -89,7 +89,7 @@ Any help (testing, patches, bug reports) will be greatly appreciated!
```
(you can preview the site with `sbt "project scalaxy-doc" preview-site`)
-- Publishing projects on Sonatype OSS Repository + advertise on ls.implicit.ly (assuming correct credentials in `~/.sbt/0.12.4/sonatype.sbt`):
+- Publishing projects on Sonatype OSS Repository + advertise on ls.implicit.ly (assuming correct credentials in `~/.sbt/0.13/sonatype.sbt`):
```
sbt "+ assembly" "+ publish"
View
4 Reified/README.md
@@ -34,9 +34,9 @@ println(compiledF(1))
# Usage
-If you're using `sbt` 0.12.2+, just put the following lines in `build.sbt`:
+If you're using `sbt` 0.13.0+, just put the following lines in `build.sbt`:
```scala
-scalaVersion := "2.10.2"
+scalaVersion := "2.10.3"
// Dependency at compilation-time only (not at runtime).
libraryDependencies += "com.nativelibs4java" %% "scalaxy-reified" % "0.3-SNAPSHOT"
View
6 project/ScalaxyBuild.scala
@@ -31,11 +31,11 @@ object Scalaxy extends Build {
lazy val scalaSettings = Seq(
//exportJars := true, // use jars in classpath
- scalaVersion := "2.10.3",
+ scalaVersion := "2.10.3"
//scalaVersion := "2.11.0-M4",
//scalaVersion := "2.11.0-SNAPSHOT",
- crossScalaVersions := Seq(
- "2.11.0-SNAPSHOT"))
+ // crossScalaVersions := Seq("2.11.0-SNAPSHOT")
+ )
lazy val infoSettings = Seq(
organization := "com.nativelibs4java",
View
2  project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.4
+sbt.version=0.13.0
View
8 project/plugins.sbt
@@ -13,13 +13,15 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.6.2")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.4")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.0")
-addSbtPlugin("org.ensime" % "ensime-sbt-cmd" % "0.1.1")
+addSbtPlugin("org.ensime" % "ensime-sbt-cmd" % "0.1.2")
//addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.1")
+//addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.0")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
Please sign in to comment.
Something went wrong with that request. Please try again.