ScalaJS: fix for importing scalapb.proto

scalapb · Dec 1, 2015 · 948b1a8 · 948b1a8
1 parent 7c3b999
commit 948b1a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -70,8 +70,9 @@ lazy val runtime = crossProject.crossType(CrossType.Full).in(file("scalapb-runti
   .jsSettings(
     // Add JS-specific settings here
     libraryDependencies ++= Seq(
-      "com.trueaccord.scalapb" %%% "protobuf-runtime-scala" % "0.1.3"
-    )
+      "com.trueaccord.scalapb" %%% "protobuf-runtime-scala" % "0.1.4"
+    ),
+    unmanagedResourceDirectories in Compile += baseDirectory.value / "../../third_party"
   )
 
 lazy val runtimeJVM = runtime.jvm

diff --git a/scalapb-runtime/js/src/main/scala/com/trueaccord/scalapb/Scalapb.scala b/scalapb-runtime/js/src/main/scala/com/trueaccord/scalapb/Scalapb.scala
@@ -0,0 +1,7 @@
+package com.trueaccord.scalapb
+
+object Scalapb {
+    def getDescriptor(): com.google.protobuf.Descriptors.FileDescriptor = {
+        throw new NotImplementedError("Descriptors are not implemented yet for ScalaJS.")
+    }
+}