Skip to content

Commit

Permalink
Port to scala-js
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-myltsev committed Jul 3, 2014
1 parent d6133b2 commit e464d46
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS
Expand Up @@ -22,3 +22,4 @@ Stacy Curl <stacy.curl@gmail.com>
Stephen Compall <scompall@nocandysw.com> @S11001001 Stephen Compall <scompall@nocandysw.com> @S11001001
Tom Switzer <thomas.switzer@gmail.com> @tixxit Tom Switzer <thomas.switzer@gmail.com> @tixxit
Travis Brown <travisrobertbrown@gmail.com> @travisbrown Travis Brown <travisrobertbrown@gmail.com> @travisbrown
Alexander Myltsev <alexander.myltsev@phystech.edu> @alex_myltsev linkedin.com/in/alexandermyltsev
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -191,4 +191,4 @@ compatibility.
+ Stephen Compall <scompall@nocandysw.com> [@S11001001](https://twitter.com/S11001001) + Stephen Compall <scompall@nocandysw.com> [@S11001001](https://twitter.com/S11001001)
+ Tom Switzer <thomas.switzer@gmail.com> [@tixxit](https://twitter.com/tixxit) + Tom Switzer <thomas.switzer@gmail.com> [@tixxit](https://twitter.com/tixxit)
+ Travis Brown <travisrobertbrown@gmail.com> [@travisbrown](https://twitter.com/travisbrown) + Travis Brown <travisrobertbrown@gmail.com> [@travisbrown](https://twitter.com/travisbrown)

+ Alexander Myltsev <alexander.myltsev@phystech.edu> [@alex_myltsev](https://twitter.com/alex_myltsev) [linkedin.com/in/alexandermyltsev](http://www.linkedin.com/in/alexandermyltsev)
6 changes: 4 additions & 2 deletions project/Build.scala
Expand Up @@ -59,7 +59,9 @@ object ShapelessBuild extends Build {
Project( Project(
id = "shapeless-core", id = "shapeless-core",
base = file("core"), base = file("core"),
settings = commonSettings ++ Publishing.settings ++ osgiSettings ++ buildInfoSettings ++ releaseSettings ++ Seq( settings = commonSettings ++ Publishing.settings ++ scala.scalajs.sbtplugin.ScalaJSPlugin.scalaJSSettings ++ bintray.Plugin.bintrayPublishSettings ++ osgiSettings ++ buildInfoSettings ++ releaseSettings ++ Seq(
licenses += ("Apache-2.0", url("http://www.apache.org/licenses/")),

moduleName := "shapeless", moduleName := "shapeless",


managedSourceDirectories in Test := Nil, managedSourceDirectories in Test := Nil,
Expand Down Expand Up @@ -161,7 +163,7 @@ object ShapelessBuild extends Build {


def commonSettings = Defaults.defaultSettings ++ def commonSettings = Defaults.defaultSettings ++
Seq( Seq(
organization := "com.chuusai", organization := "name.myltsev",
scalaVersion := "2.11.0", scalaVersion := "2.11.0",


(unmanagedSourceDirectories in Compile) <<= (scalaSource in Compile)(Seq(_)), (unmanagedSourceDirectories in Compile) <<= (scalaSource in Compile)(Seq(_)),
Expand Down
8 changes: 8 additions & 0 deletions project/scalajs.sbt
@@ -0,0 +1,8 @@
addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.1")

resolvers += Resolver.url(
"bintray-sbt-plugin-releases",
url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
Resolver.ivyStylePatterns)

addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1")

0 comments on commit e464d46

Please sign in to comment.