Skip to content

Commit

Permalink
Use conflicting path to build-in proto3 type
Browse files Browse the repository at this point in the history
  • Loading branch information
tom-haines committed Apr 16, 2021
1 parent ac2ae3e commit 78c6183
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ abstract class ProtobufExtract extends DefaultTask {
spec.include('**/*.proto')
spec.into(destDir)
// gradle 7+ requires a duplicate strategy to be explicitly defined
spec.duplicatesStrategy = DuplicatesStrategy.INCLUDE
// spec.duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,27 @@ syntax = "proto3";

package google.type;

option cc_enable_arenas = true;
option go_package = "google.golang.org/genproto/googleapis/type/money;money";
option java_multiple_files = true;
option java_outer_classname = "MoneyProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";

// Represents an amount of money with its currency type.
message Money {
// The three-letter currency code defined in ISO 4217.
string currency_code = 1;
}

// The whole units of the amount.
// For example if `currencyCode` is `"USD"`, then 1 unit is one US dollar.
int64 units = 2;

// Number of nano (10^-9) units of the amount.
// The value must be between -999,999,999 and +999,999,999 inclusive.
// If `units` is positive, `nanos` must be positive or zero.
// If `units` is zero, `nanos` can be positive, zero, or negative.
// If `units` is negative, `nanos` must be negative or zero.
// For example $-1.75 is represented as `units`=-1 and `nanos`=-750,000,000.
int32 nanos = 3;
}

0 comments on commit 78c6183

Please sign in to comment.