Skip to content

Commit

Permalink
Merge pull request #125 from Katee/support-protobuf-v21.0-rc1
Browse files Browse the repository at this point in the history
Support protobuf v21.0 rc1
  • Loading branch information
dibenede committed Aug 1, 2022
2 parents 88f356e + 4dcdee2 commit a428c58
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion generator/js_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion generator/well_known_types_embed.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit a428c58

Please sign in to comment.