Skip to content

Remove some unactionable warnings on Kotlin/JS #3047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swankjesse merged 2 commits into from
Jul 25, 2024
Merged

Remove some unactionable warnings on Kotlin/JS #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98c9fc4
Remove some unactionable warnings on Kotlin/JS
swankjesse Jul 25, 2024
3db90e1
Fix annotations and generate everything
oldergod Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/alltypes/AllTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.alltypes.AllTypes in squareup/wire/all_types.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.alltypes

Expand Down
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/boxedoneof/BoxedOneOfs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.boxedoneof.BoxedOneOfs in squareup/wire/boxed_oneof.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.boxedoneof

Expand Down
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/buildersonly/SomeMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.buildersonly.SomeMessage in squareup/wire/some_message.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.buildersonly

Expand Down
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/repeateddata/ParameterValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.repeateddata.ParameterValue in squareup/wire/repeated_data.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.repeateddata

Expand Down
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/repeateddata/ParameterValueWithArray.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.repeateddata.ParameterValueWithArray in squareup/wire/repeated_data.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.repeateddata

Expand Down
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/unrecognized_constant/Easter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.unrecognized_constant.Easter in squareup/wire/easter_unrecognized_enum.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.unrecognized_constant

Expand Down
5 changes: 4 additions & 1 deletion wire-golden-files/src/main/kotlin/squareup/wire/unrecognized_constant/EasterAnimal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.wire.unrecognized_constant.EasterAnimal in squareup/wire/easter_unrecognized_enum.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.wire.unrecognized_constant

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/Feature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.Feature in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/FeatureDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.FeatureDatabase in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/GrpcRouteGuideClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.RouteGuide in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/Point.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.Point in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/Rectangle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.Rectangle in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/RouteGuideClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.RouteGuide in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/RouteNote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.RouteNote in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion wire-grpc-tests/src/test/proto-grpc/routeguide/RouteSummary.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: routeguide.RouteSummary in routeguide/RouteGuideProto.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package routeguide

Expand Down
5 changes: 4 additions & 1 deletion ...on-support/src/test/java/com/squareup/wire/proto2/dinosaurs/javainteropkotlin/Dinosaur.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.dinosaurs.javainteropkotlin.Dinosaur in dinosaur_java_interop_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.dinosaurs.javainteropkotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/com/squareup/wire/proto2/dinosaurs/kotlin/Dinosaur.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.dinosaurs.kotlin.Dinosaur in dinosaur_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.dinosaurs.kotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/com/squareup/wire/proto2/geology/javainteropkotlin/Period.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.geology.javainteropkotlin.Period in period_java_interop_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.geology.javainteropkotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/com/squareup/wire/proto2/geology/kotlin/Period.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.geology.kotlin.Period in period_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.geology.kotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/com/squareup/wire/proto2/kotlin/Getters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto2.kotlin.Getters in getters_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.kotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/com/squareup/wire/proto2/person/kotlin/Person.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto2.person.kotlin.Person in person_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.person.kotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto2/keywords/KeywordKotlin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto2.keywords.KeywordKotlin in keyword_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto2.keywords

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto3/AllStructs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto3.AllStructs in all_structs.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto3

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto3/BuyOneGetOnePromotion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto3.BuyOneGetOnePromotion in pizza.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto3

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto3/FreeDrinkPromotion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto3.FreeDrinkPromotion in pizza.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto3

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto3/FreeGarlicBreadPromotion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto3.FreeGarlicBreadPromotion in pizza.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto3

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto3/Pizza.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto3.Pizza in pizza.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto3

Expand Down
5 changes: 4 additions & 1 deletion wire-gson-support/src/test/java/squareup/proto3/PizzaDelivery.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto3.PizzaDelivery in pizza.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package squareup.proto3

Expand Down
5 changes: 3 additions & 2 deletions wire-kotlin-generator/src/main/java/com/squareup/wire/kotlin/KotlinSchemaHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,13 @@ class KotlinSchemaHandler(
val kotlinFile = FileSpec.builder(name.packageName, name.simpleName)
.addFileComment(CODE_GENERATED_BY_WIRE)
.addFileComment("\nSource: %L in %L", source, location.withPathOnly())
// If a file contains deprecation, we don't want to pollute the consumer's logs with something
// they might not be able to control.
// DEPRECATION: Don't warn about Wire's internal use of deprecated symbols.
// RUNTIME_ANNOTATION_NOT_SUPPORTED: Don't warn about @WireField in Kotlin/JS.
.addAnnotation(
AnnotationSpec.builder(Suppress::class)
.useSiteTarget(FILE)
.addMember("%S", "DEPRECATION")
.addMember("%S", "RUNTIME_ANNOTATION_NOT_SUPPORTED")
Comment on lines +157 to +163
Copy link
Copy Markdown
Member

@oldergod oldergod Jul 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix™

Copy link
Copy Markdown
Collaborator Author

@swankjesse swankjesse Jul 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TY

.build(),
)
.addType(typeSpec)
Expand Down
5 changes: 4 additions & 1 deletion ...hi-adapter/src/test/java/com/squareup/wire/proto2/dinosaurs/javainteropkotlin/Dinosaur.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.dinosaurs.javainteropkotlin.Dinosaur in dinosaur_java_interop_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.dinosaurs.javainteropkotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/dinosaurs/kotlin/Dinosaur.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.dinosaurs.kotlin.Dinosaur in dinosaur_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.dinosaurs.kotlin

Expand Down
5 changes: 4 additions & 1 deletion ...-moshi-adapter/src/test/java/com/squareup/wire/proto2/geology/javainteropkotlin/Period.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.geology.javainteropkotlin.Period in period_java_interop_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.geology.javainteropkotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/geology/kotlin/Period.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.geology.kotlin.Period in period_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.geology.kotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/kotlin/Getters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto2.kotlin.Getters in getters_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.kotlin

Expand Down
5 changes: 4 additions & 1 deletion wire-moshi-adapter/src/test/java/com/squareup/wire/proto2/person/javainteropkotlin/Person.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Code generated by Wire protocol buffer compiler, do not edit.
// Source: squareup.proto2.person.javainteropkotlin.Person in person_java_interop_kotlin.proto
@file:Suppress("DEPRECATION")
@file:Suppress(
"DEPRECATION",
"RUNTIME_ANNOTATION_NOT_SUPPORTED",
)

package com.squareup.wire.proto2.person.javainteropkotlin

Expand Down
Loading