Merge pull request #125 from Katee/support-protobuf-v21.0-rc1

Support protobuf v21.0 rc1

Author: dibenede

WORKSPACE

@@ -1,13 +1,13 @@
-
 workspace(name = "com_google_protobuf_javascript")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "com_google_protobuf",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.20.1.zip"],
-    strip_prefix = "protobuf-3.20.1",
+    strip_prefix = "protobuf-21.0-rc1",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.0-rc1.zip"],
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
 protobuf_deps()

generator/js_generator.cc

@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assert.h>
-#include <google/protobuf/compiler/js/well_known_types_embed.h>
+#include "generator/well_known_types_embed.h"
 #include <google/protobuf/compiler/scc.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>

generator/well_known_types_embed.cc

@@ -28,7 +28,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <google/protobuf/compiler/js/well_known_types_embed.h>
+#include "generator/well_known_types_embed.h"
 
 struct FileToc well_known_types_js[] = {
     {"any.js",