From 15df50eb7f37a40fbb2ee919ae11243643d0cd23 Mon Sep 17 00:00:00 2001 From: Aaron Riekenberg Date: Sun, 13 Feb 2022 22:29:36 -0600 Subject: [PATCH] Remove @ExperimentalUnsignedTypes annotation from kotlin code generator. (#7092) --- src/idl_gen_kotlin.cpp | 2 -- tests/MyGame/Example/Ability.kt | 1 - tests/MyGame/Example/Any.kt | 1 - tests/MyGame/Example/AnyAmbiguousAliases.kt | 1 - tests/MyGame/Example/AnyUniqueAliases.kt | 1 - tests/MyGame/Example/Color.kt | 1 - tests/MyGame/Example/Monster.kt | 1 - tests/MyGame/Example/Race.kt | 1 - tests/MyGame/Example/Referrable.kt | 1 - tests/MyGame/Example/Stat.kt | 1 - tests/MyGame/Example/StructOfStructs.kt | 1 - tests/MyGame/Example/Test.kt | 1 - tests/MyGame/Example/TestSimpleTableWithEnum.kt | 1 - tests/MyGame/Example/TypeAliases.kt | 1 - tests/MyGame/Example/Vec3.kt | 1 - tests/MyGame/Example2/Monster.kt | 1 - tests/MyGame/InParentNamespace.kt | 1 - tests/MyGame/MonsterExtra.kt | 1 - tests/optional_scalars/OptionalByte.kt | 1 - tests/optional_scalars/ScalarStuff.kt | 1 - tests/union_vector/Attacker.kt | 1 - tests/union_vector/BookReader.kt | 1 - tests/union_vector/Character.kt | 1 - tests/union_vector/FallingTub.kt | 1 - tests/union_vector/Gadget.kt | 1 - tests/union_vector/HandFan.kt | 1 - tests/union_vector/Movie.kt | 1 - tests/union_vector/Rapunzel.kt | 1 - 28 files changed, 29 deletions(-) diff --git a/src/idl_gen_kotlin.cpp b/src/idl_gen_kotlin.cpp index f2f135b89..3977a3fed 100644 --- a/src/idl_gen_kotlin.cpp +++ b/src/idl_gen_kotlin.cpp @@ -259,7 +259,6 @@ class KotlinGenerator : public BaseGenerator { GenerateComment(enum_def.doc_comment, writer, &comment_config); writer += "@Suppress(\"unused\")"; - writer += "@ExperimentalUnsignedTypes"; writer += "class " + Esc(enum_def.name) + " private constructor() {"; writer.IncrementIdentLevel(); @@ -461,7 +460,6 @@ class KotlinGenerator : public BaseGenerator { writer.SetValue("superclass", fixed ? "Struct" : "Table"); writer += "@Suppress(\"unused\")"; - writer += "@ExperimentalUnsignedTypes"; writer += "class {{struct_name}} : {{superclass}}() {\n"; writer.IncrementIdentLevel(); diff --git a/tests/MyGame/Example/Ability.kt b/tests/MyGame/Example/Ability.kt index 1b644d6ea..19a2f5661 100644 --- a/tests/MyGame/Example/Ability.kt +++ b/tests/MyGame/Example/Ability.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Ability : Struct() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/Any.kt b/tests/MyGame/Example/Any.kt index f1a4dfed1..5a7ecf765 100644 --- a/tests/MyGame/Example/Any.kt +++ b/tests/MyGame/Example/Any.kt @@ -3,7 +3,6 @@ package MyGame.Example @Suppress("unused") -@ExperimentalUnsignedTypes class Any_ private constructor() { companion object { const val NONE: UByte = 0u diff --git a/tests/MyGame/Example/AnyAmbiguousAliases.kt b/tests/MyGame/Example/AnyAmbiguousAliases.kt index cee13c51e..c38923b9e 100644 --- a/tests/MyGame/Example/AnyAmbiguousAliases.kt +++ b/tests/MyGame/Example/AnyAmbiguousAliases.kt @@ -3,7 +3,6 @@ package MyGame.Example @Suppress("unused") -@ExperimentalUnsignedTypes class AnyAmbiguousAliases private constructor() { companion object { const val NONE: UByte = 0u diff --git a/tests/MyGame/Example/AnyUniqueAliases.kt b/tests/MyGame/Example/AnyUniqueAliases.kt index 1902d5d60..2db45a6c2 100644 --- a/tests/MyGame/Example/AnyUniqueAliases.kt +++ b/tests/MyGame/Example/AnyUniqueAliases.kt @@ -3,7 +3,6 @@ package MyGame.Example @Suppress("unused") -@ExperimentalUnsignedTypes class AnyUniqueAliases private constructor() { companion object { const val NONE: UByte = 0u diff --git a/tests/MyGame/Example/Color.kt b/tests/MyGame/Example/Color.kt index 4c27ba35d..0af56e1ee 100644 --- a/tests/MyGame/Example/Color.kt +++ b/tests/MyGame/Example/Color.kt @@ -6,7 +6,6 @@ package MyGame.Example * Composite components of Monster color. */ @Suppress("unused") -@ExperimentalUnsignedTypes class Color private constructor() { companion object { const val Red: UByte = 1u diff --git a/tests/MyGame/Example/Monster.kt b/tests/MyGame/Example/Monster.kt index ee527d02a..769da3ae7 100644 --- a/tests/MyGame/Example/Monster.kt +++ b/tests/MyGame/Example/Monster.kt @@ -10,7 +10,6 @@ import com.google.flatbuffers.* * an example documentation comment: "monster object" */ @Suppress("unused") -@ExperimentalUnsignedTypes class Monster : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/Race.kt b/tests/MyGame/Example/Race.kt index 6eb953488..6f770a3c9 100644 --- a/tests/MyGame/Example/Race.kt +++ b/tests/MyGame/Example/Race.kt @@ -3,7 +3,6 @@ package MyGame.Example @Suppress("unused") -@ExperimentalUnsignedTypes class Race private constructor() { companion object { const val None: Byte = -1 diff --git a/tests/MyGame/Example/Referrable.kt b/tests/MyGame/Example/Referrable.kt index b43441915..7f728a7aa 100644 --- a/tests/MyGame/Example/Referrable.kt +++ b/tests/MyGame/Example/Referrable.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Referrable : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/Stat.kt b/tests/MyGame/Example/Stat.kt index 43755b4f6..e6cc94cf0 100644 --- a/tests/MyGame/Example/Stat.kt +++ b/tests/MyGame/Example/Stat.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Stat : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/StructOfStructs.kt b/tests/MyGame/Example/StructOfStructs.kt index 2a6bf9b7c..56ab9af03 100644 --- a/tests/MyGame/Example/StructOfStructs.kt +++ b/tests/MyGame/Example/StructOfStructs.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class StructOfStructs : Struct() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/Test.kt b/tests/MyGame/Example/Test.kt index f2ceed6f5..eda574217 100644 --- a/tests/MyGame/Example/Test.kt +++ b/tests/MyGame/Example/Test.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Test : Struct() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.kt b/tests/MyGame/Example/TestSimpleTableWithEnum.kt index faf98cce1..64bf7e239 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.kt +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class TestSimpleTableWithEnum : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/TypeAliases.kt b/tests/MyGame/Example/TypeAliases.kt index 64e095297..cdc82b50a 100644 --- a/tests/MyGame/Example/TypeAliases.kt +++ b/tests/MyGame/Example/TypeAliases.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class TypeAliases : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example/Vec3.kt b/tests/MyGame/Example/Vec3.kt index 90f1b4ad0..445601c70 100644 --- a/tests/MyGame/Example/Vec3.kt +++ b/tests/MyGame/Example/Vec3.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Vec3 : Struct() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/Example2/Monster.kt b/tests/MyGame/Example2/Monster.kt index 29caf52df..88b9d057f 100644 --- a/tests/MyGame/Example2/Monster.kt +++ b/tests/MyGame/Example2/Monster.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Monster : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/InParentNamespace.kt b/tests/MyGame/InParentNamespace.kt index b268f0db2..beb414aa1 100644 --- a/tests/MyGame/InParentNamespace.kt +++ b/tests/MyGame/InParentNamespace.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class InParentNamespace : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/MyGame/MonsterExtra.kt b/tests/MyGame/MonsterExtra.kt index f55cfb568..f2226479e 100644 --- a/tests/MyGame/MonsterExtra.kt +++ b/tests/MyGame/MonsterExtra.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class MonsterExtra : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/optional_scalars/OptionalByte.kt b/tests/optional_scalars/OptionalByte.kt index 41fe6cddf..afb36909c 100644 --- a/tests/optional_scalars/OptionalByte.kt +++ b/tests/optional_scalars/OptionalByte.kt @@ -3,7 +3,6 @@ package optional_scalars @Suppress("unused") -@ExperimentalUnsignedTypes class OptionalByte private constructor() { companion object { const val None: Byte = 0 diff --git a/tests/optional_scalars/ScalarStuff.kt b/tests/optional_scalars/ScalarStuff.kt index 0c618a946..5ab8bf425 100644 --- a/tests/optional_scalars/ScalarStuff.kt +++ b/tests/optional_scalars/ScalarStuff.kt @@ -7,7 +7,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class ScalarStuff : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/union_vector/Attacker.kt b/tests/union_vector/Attacker.kt index 105d3bc23..9f22e985a 100644 --- a/tests/union_vector/Attacker.kt +++ b/tests/union_vector/Attacker.kt @@ -5,7 +5,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Attacker : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/union_vector/BookReader.kt b/tests/union_vector/BookReader.kt index fc41473b1..558606e03 100644 --- a/tests/union_vector/BookReader.kt +++ b/tests/union_vector/BookReader.kt @@ -5,7 +5,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class BookReader : Struct() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/union_vector/Character.kt b/tests/union_vector/Character.kt index ff7dd5e84..2e80a35f1 100644 --- a/tests/union_vector/Character.kt +++ b/tests/union_vector/Character.kt @@ -1,7 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify @Suppress("unused") -@ExperimentalUnsignedTypes class Character_ private constructor() { companion object { const val NONE: UByte = 0u diff --git a/tests/union_vector/FallingTub.kt b/tests/union_vector/FallingTub.kt index 5d753ec7b..0a823e250 100644 --- a/tests/union_vector/FallingTub.kt +++ b/tests/union_vector/FallingTub.kt @@ -5,7 +5,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class FallingTub : Struct() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/union_vector/Gadget.kt b/tests/union_vector/Gadget.kt index d6181ab4d..4fb3b1007 100644 --- a/tests/union_vector/Gadget.kt +++ b/tests/union_vector/Gadget.kt @@ -1,7 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify @Suppress("unused") -@ExperimentalUnsignedTypes class Gadget private constructor() { companion object { const val NONE: UByte = 0u diff --git a/tests/union_vector/HandFan.kt b/tests/union_vector/HandFan.kt index 081597c71..0a8a055f0 100644 --- a/tests/union_vector/HandFan.kt +++ b/tests/union_vector/HandFan.kt @@ -5,7 +5,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class HandFan : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/union_vector/Movie.kt b/tests/union_vector/Movie.kt index 3342db203..a9ad90633 100644 --- a/tests/union_vector/Movie.kt +++ b/tests/union_vector/Movie.kt @@ -5,7 +5,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Movie : Table() { fun __init(_i: Int, _bb: ByteBuffer) { diff --git a/tests/union_vector/Rapunzel.kt b/tests/union_vector/Rapunzel.kt index 080a7f7da..72261d471 100644 --- a/tests/union_vector/Rapunzel.kt +++ b/tests/union_vector/Rapunzel.kt @@ -5,7 +5,6 @@ import kotlin.math.sign import com.google.flatbuffers.* @Suppress("unused") -@ExperimentalUnsignedTypes class Rapunzel : Struct() { fun __init(_i: Int, _bb: ByteBuffer) {