From 0a7508f2635923f0a9960a23fdfff009113ddf87 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 27 Jun 2022 15:16:04 +1000 Subject: [PATCH] Add java_multiple_files option to proto files Saves AnkiDroid needing to patch these in. --- proto/anki/backend.proto | 2 ++ proto/anki/card_rendering.proto | 2 ++ proto/anki/cards.proto | 2 ++ proto/anki/collection.proto | 2 ++ proto/anki/config.proto | 2 ++ proto/anki/deckconfig.proto | 4 ++++ proto/anki/decks.proto | 2 ++ proto/anki/generic.proto | 2 ++ proto/anki/i18n.proto | 2 ++ proto/anki/import_export.proto | 2 ++ proto/anki/links.proto | 2 ++ proto/anki/media.proto | 2 ++ proto/anki/notes.proto | 2 ++ proto/anki/notetypes.proto | 2 ++ proto/anki/scheduler.proto | 2 ++ proto/anki/search.proto | 2 ++ proto/anki/stats.proto | 2 ++ proto/anki/sync.proto | 2 ++ proto/anki/tags.proto | 2 ++ 19 files changed, 40 insertions(+) diff --git a/proto/anki/backend.proto b/proto/anki/backend.proto index e24c63992..a1c19e61b 100644 --- a/proto/anki/backend.proto +++ b/proto/anki/backend.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.backend; import "anki/links.proto"; diff --git a/proto/anki/card_rendering.proto b/proto/anki/card_rendering.proto index aa16e4a91..6bf4ed7ff 100644 --- a/proto/anki/card_rendering.proto +++ b/proto/anki/card_rendering.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.card_rendering; import "anki/generic.proto"; diff --git a/proto/anki/cards.proto b/proto/anki/cards.proto index c8801448b..d33767238 100644 --- a/proto/anki/cards.proto +++ b/proto/anki/cards.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.cards; import "anki/generic.proto"; diff --git a/proto/anki/collection.proto b/proto/anki/collection.proto index 0321aa82a..daddc67c2 100644 --- a/proto/anki/collection.proto +++ b/proto/anki/collection.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.collection; import "anki/generic.proto"; diff --git a/proto/anki/config.proto b/proto/anki/config.proto index 90423518e..66294543a 100644 --- a/proto/anki/config.proto +++ b/proto/anki/config.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.config; import "anki/generic.proto"; diff --git a/proto/anki/deckconfig.proto b/proto/anki/deckconfig.proto index 86307d100..57b56212d 100644 --- a/proto/anki/deckconfig.proto +++ b/proto/anki/deckconfig.proto @@ -3,6 +3,10 @@ syntax = "proto3"; +option java_multiple_files = true; +// the DeckConfig message clashes with the name of the file +option java_outer_classname = "DeckConf"; + package anki.deckconfig; import "anki/generic.proto"; diff --git a/proto/anki/decks.proto b/proto/anki/decks.proto index 6bc7159a5..3409acc97 100644 --- a/proto/anki/decks.proto +++ b/proto/anki/decks.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.decks; import "anki/generic.proto"; diff --git a/proto/anki/generic.proto b/proto/anki/generic.proto index 83f765b46..70de05f43 100644 --- a/proto/anki/generic.proto +++ b/proto/anki/generic.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.generic; message Empty {} diff --git a/proto/anki/i18n.proto b/proto/anki/i18n.proto index 1f135287b..1d5ca05ce 100644 --- a/proto/anki/i18n.proto +++ b/proto/anki/i18n.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.i18n; import "anki/generic.proto"; diff --git a/proto/anki/import_export.proto b/proto/anki/import_export.proto index 0cc2a19d9..85d68e1b8 100644 --- a/proto/anki/import_export.proto +++ b/proto/anki/import_export.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.import_export; import "anki/cards.proto"; diff --git a/proto/anki/links.proto b/proto/anki/links.proto index 7566f91ee..d66d10bc9 100644 --- a/proto/anki/links.proto +++ b/proto/anki/links.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.links; import "anki/generic.proto"; diff --git a/proto/anki/media.proto b/proto/anki/media.proto index f506615b8..d2d2ee9fc 100644 --- a/proto/anki/media.proto +++ b/proto/anki/media.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.media; import "anki/generic.proto"; diff --git a/proto/anki/notes.proto b/proto/anki/notes.proto index ced401e76..eb48042d2 100644 --- a/proto/anki/notes.proto +++ b/proto/anki/notes.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.notes; import "anki/notetypes.proto"; diff --git a/proto/anki/notetypes.proto b/proto/anki/notetypes.proto index f245a7466..6bd9d37ab 100644 --- a/proto/anki/notetypes.proto +++ b/proto/anki/notetypes.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.notetypes; import "anki/generic.proto"; diff --git a/proto/anki/scheduler.proto b/proto/anki/scheduler.proto index c133664ac..8f90088d3 100644 --- a/proto/anki/scheduler.proto +++ b/proto/anki/scheduler.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.scheduler; import "anki/generic.proto"; diff --git a/proto/anki/search.proto b/proto/anki/search.proto index 4048d255a..2db361619 100644 --- a/proto/anki/search.proto +++ b/proto/anki/search.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.search; import "anki/generic.proto"; diff --git a/proto/anki/stats.proto b/proto/anki/stats.proto index 4f365264a..df71ddd5b 100644 --- a/proto/anki/stats.proto +++ b/proto/anki/stats.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.stats; import "anki/generic.proto"; diff --git a/proto/anki/sync.proto b/proto/anki/sync.proto index 67553884f..4bd2bcd17 100644 --- a/proto/anki/sync.proto +++ b/proto/anki/sync.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.sync; import "anki/generic.proto"; diff --git a/proto/anki/tags.proto b/proto/anki/tags.proto index c2ff124cb..ab55f92bb 100644 --- a/proto/anki/tags.proto +++ b/proto/anki/tags.proto @@ -3,6 +3,8 @@ syntax = "proto3"; +option java_multiple_files = true; + package anki.tags; import "anki/generic.proto";