Skip to content

Commit 93640ce

Browse files
dconeybedconeybe
authored
dataconnect: Rename FirebaseDataConnectExperimental to ExperimentalFirebaseDataConnect (#6433)
1 parent 312d14a commit 93640ce

File tree

23 files changed

+76
-73
lines changed

23 files changed

+76
-73
lines changed

‎firebase-dataconnect/CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
must implement equals() to be a _logical_ comparsion, rather than just
1414
checking for _referencial_ equality using the `===` operator.
1515
([#6424](https://github.com/firebase/firebase-android-sdk/pull/6424))
16-
* [feature] FirebaseDataConnectExperimental annotation added, and some
16+
* [feature] ExperimentalFirebaseDataConnect annotation added, and some
1717
APIs have been annotated with it, requiring applications that make use of
1818
these experimental APIs to opt-in using
19-
`@OptIn(FirebaseDataConnectExperimental::class)` to suppress warnings or
19+
`@OptIn(ExperimentalFirebaseDataConnect::class)` to suppress warnings or
2020
errors related to using these experimental APIs.
21-
([#6424](https://github.com/firebase/firebase-android-sdk/pull/6424))
21+
([#6424](https://github.com/firebase/firebase-android-sdk/pull/6424)) and
22+
([#6433](https://github.com/firebase/firebase-android-sdk/pull/6433))
2223

2324
# 16.0.0-beta02
2425
* [changed] Updated protobuf dependency to `3.25.5` to fix

‎firebase-dataconnect/api.txt

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

‎firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/DateScalarIntegrationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(FirebaseDataConnectExperimental::class)
17+
@file:OptIn(ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.connectors.demo
2020

2121
import com.google.firebase.dataconnect.DataConnectException
22-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
22+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
2323
import com.google.firebase.dataconnect.connectors.demo.testutil.DemoConnectorIntegrationTestBase
2424
import com.google.firebase.dataconnect.generated.GeneratedMutation
2525
import com.google.firebase.dataconnect.generated.GeneratedQuery

‎firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/TimestampScalarIntegrationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(FirebaseDataConnectExperimental::class)
17+
@file:OptIn(ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.connectors.demo
2020

2121
import com.google.firebase.Timestamp
22-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
22+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
2323
import com.google.firebase.dataconnect.MutationResult
2424
import com.google.firebase.dataconnect.OperationResult
2525
import com.google.firebase.dataconnect.connectors.demo.testutil.DemoConnectorIntegrationTestBase

‎firebase-dataconnect/connectors/src/test/kotlin/com/google/firebase/dataconnect/connectors/GeneratedConnectorUnitTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(ExperimentalKotest::class, FirebaseDataConnectExperimental::class)
17+
@file:OptIn(ExperimentalKotest::class, ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.connectors
2020

2121
import androidx.test.ext.junit.runners.AndroidJUnit4
2222
import com.google.firebase.dataconnect.ConnectorConfig
2323
import com.google.firebase.dataconnect.DataConnectSettings
24+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
2425
import com.google.firebase.dataconnect.FirebaseDataConnect
25-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
2626
import com.google.firebase.dataconnect.connectors.demo.DemoConnector
2727
import com.google.firebase.dataconnect.connectors.demo.getInstance
2828
import com.google.firebase.dataconnect.generated.GeneratedConnector

‎firebase-dataconnect/connectors/src/test/kotlin/com/google/firebase/dataconnect/connectors/GeneratedOperationUnitTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(ExperimentalKotest::class, FirebaseDataConnectExperimental::class)
17+
@file:OptIn(ExperimentalKotest::class, ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.connectors
2020

2121
import androidx.test.ext.junit.runners.AndroidJUnit4
22-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
22+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
2323
import com.google.firebase.dataconnect.connectors.demo.DemoConnector
2424
import com.google.firebase.dataconnect.connectors.demo.getInstance
2525
import com.google.firebase.dataconnect.generated.GeneratedConnector

‎firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/DataConnectUntypedDataIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(FirebaseDataConnectExperimental::class)
17+
@file:OptIn(ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect
2020

‎firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/GrpcMetadataIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(FirebaseDataConnectExperimental::class)
17+
@file:OptIn(ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect
2020

‎firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QuerySubscriptionIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(FlowPreview::class, FirebaseDataConnectExperimental::class)
17+
@file:OptIn(FlowPreview::class, ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect
2020

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/FirebaseDataConnectExperimental.kt renamed to ‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/ExperimentalFirebaseDataConnect.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.google.firebase.dataconnect
1919
/**
2020
* Marks declarations in the Firebase Data Connect SDK that are **experimental**.
2121
*
22-
* A declaration annotated with [FirebaseDataConnectExperimental] is "experimental": its signature
22+
* A declaration annotated with [ExperimentalFirebaseDataConnect] is "experimental": its signature
2323
* and/or semantics may change in backwards-incompatible ways at any time without notice, up to and
2424
* including complete removal. If you have a use case that relies on such a declaration please open
2525
* a "feature request" issue at https://github.com/firebase/firebase-android-sdk requesting the
@@ -37,4 +37,4 @@ package com.google.firebase.dataconnect
3737
"\"feature request\" issue at https://github.com/firebase/firebase-android-sdk " +
3838
"requesting this declaration's promotion from \"experimental\" to \"fully-supported\"."
3939
)
40-
public annotation class FirebaseDataConnectExperimental
40+
public annotation class ExperimentalFirebaseDataConnect

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/MutationRef.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import kotlinx.serialization.modules.SerializersModule
3636
public interface MutationRef<Data, Variables> : OperationRef<Data, Variables> {
3737
override suspend fun execute(): MutationResult<Data, Variables>
3838

39-
@FirebaseDataConnectExperimental
39+
@ExperimentalFirebaseDataConnect
4040
override fun copy(
4141
operationName: String,
4242
variables: Variables,
@@ -47,14 +47,14 @@ public interface MutationRef<Data, Variables> : OperationRef<Data, Variables> {
4747
variablesSerializersModule: SerializersModule?,
4848
): MutationRef<Data, Variables>
4949

50-
@FirebaseDataConnectExperimental
50+
@ExperimentalFirebaseDataConnect
5151
override fun <NewVariables> withVariablesSerializer(
5252
variables: NewVariables,
5353
variablesSerializer: SerializationStrategy<NewVariables>,
5454
variablesSerializersModule: SerializersModule?,
5555
): MutationRef<Data, NewVariables>
5656

57-
@FirebaseDataConnectExperimental
57+
@ExperimentalFirebaseDataConnect
5858
override fun <NewData> withDataDeserializer(
5959
dataDeserializer: DeserializationStrategy<NewData>,
6060
dataSerializersModule: SerializersModule?,

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/OperationRef.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public interface OperationRef<Data, Variables> {
184184
* @see withDataDeserializer
185185
* @see withVariablesSerializer
186186
*/
187-
@FirebaseDataConnectExperimental
187+
@ExperimentalFirebaseDataConnect
188188
public fun copy(
189189
operationName: String = this.operationName,
190190
variables: Variables = this.variables,
@@ -202,7 +202,7 @@ public interface OperationRef<Data, Variables> {
202202
* @see copy
203203
* @see withDataDeserializer
204204
*/
205-
@FirebaseDataConnectExperimental
205+
@ExperimentalFirebaseDataConnect
206206
public fun <NewVariables> withVariablesSerializer(
207207
variables: NewVariables,
208208
variablesSerializer: SerializationStrategy<NewVariables>,
@@ -216,7 +216,7 @@ public interface OperationRef<Data, Variables> {
216216
* @see copy
217217
* @see withVariablesSerializer
218218
*/
219-
@FirebaseDataConnectExperimental
219+
@ExperimentalFirebaseDataConnect
220220
public fun <NewData> withDataDeserializer(
221221
dataDeserializer: DeserializationStrategy<NewData>,
222222
dataSerializersModule: SerializersModule? = this.dataSerializersModule,

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/QueryRef.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public interface QueryRef<Data, Variables> : OperationRef<Data, Variables> {
4747
*/
4848
public fun subscribe(): QuerySubscription<Data, Variables>
4949

50-
@FirebaseDataConnectExperimental
50+
@ExperimentalFirebaseDataConnect
5151
override fun copy(
5252
operationName: String,
5353
variables: Variables,
@@ -58,14 +58,14 @@ public interface QueryRef<Data, Variables> : OperationRef<Data, Variables> {
5858
variablesSerializersModule: SerializersModule?,
5959
): QueryRef<Data, Variables>
6060

61-
@FirebaseDataConnectExperimental
61+
@ExperimentalFirebaseDataConnect
6262
override fun <NewVariables> withVariablesSerializer(
6363
variables: NewVariables,
6464
variablesSerializer: SerializationStrategy<NewVariables>,
6565
variablesSerializersModule: SerializersModule?,
6666
): QueryRef<Data, NewVariables>
6767

68-
@FirebaseDataConnectExperimental
68+
@ExperimentalFirebaseDataConnect
6969
override fun <NewData> withDataDeserializer(
7070
dataDeserializer: DeserializationStrategy<NewData>,
7171
dataSerializersModule: SerializersModule?,

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/MutationRefImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
@file:OptIn(com.google.firebase.dataconnect.FirebaseDataConnectExperimental::class)
16+
@file:OptIn(com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect::class)
1717

1818
package com.google.firebase.dataconnect.core
1919

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/OperationRefImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(com.google.firebase.dataconnect.FirebaseDataConnectExperimental::class)
17+
@file:OptIn(com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.core
2020

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/QueryRefImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(com.google.firebase.dataconnect.FirebaseDataConnectExperimental::class)
17+
@file:OptIn(com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.core
2020

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/QuerySubscriptionImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(com.google.firebase.dataconnect.FirebaseDataConnectExperimental::class)
17+
@file:OptIn(com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect::class)
1818

1919
package com.google.firebase.dataconnect.core
2020

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedConnector.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.firebase.dataconnect.generated
1818

19+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
1920
import com.google.firebase.dataconnect.FirebaseDataConnect
20-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
2121

2222
/**
2323
* The interface to be implemented by the over-arching "connector" classes that are generated by the
@@ -48,7 +48,7 @@ public interface GeneratedConnector<T : GeneratedConnector<T>> {
4848
* This function is essentially the same as the `copy()` method that is generated by the Kotlin
4949
* compiler for `data class` classes.
5050
*/
51-
@FirebaseDataConnectExperimental
51+
@ExperimentalFirebaseDataConnect
5252
public fun copy(
5353
dataConnect: FirebaseDataConnect = this.dataConnect,
5454
): T
@@ -63,7 +63,7 @@ public interface GeneratedConnector<T : GeneratedConnector<T>> {
6363
* @see queries
6464
* @see mutations
6565
*/
66-
@FirebaseDataConnectExperimental public fun operations(): List<GeneratedOperation<T, *, *>>
66+
@ExperimentalFirebaseDataConnect public fun operations(): List<GeneratedOperation<T, *, *>>
6767

6868
/**
6969
* Returns a list containing all [GeneratedQuery] objects defined as properties in this object in
@@ -72,7 +72,7 @@ public interface GeneratedConnector<T : GeneratedConnector<T>> {
7272
* @see operations
7373
* @see mutations
7474
*/
75-
@FirebaseDataConnectExperimental public fun queries(): List<GeneratedQuery<T, *, *>>
75+
@ExperimentalFirebaseDataConnect public fun queries(): List<GeneratedQuery<T, *, *>>
7676

7777
/**
7878
* Returns a list containing all [GeneratedMutation] objects defined as properties in this object
@@ -81,7 +81,7 @@ public interface GeneratedConnector<T : GeneratedConnector<T>> {
8181
* @see operations
8282
* @see queries
8383
*/
84-
@FirebaseDataConnectExperimental public fun mutations(): List<GeneratedMutation<T, *, *>>
84+
@ExperimentalFirebaseDataConnect public fun mutations(): List<GeneratedMutation<T, *, *>>
8585

8686
/**
8787
* Compares this object with another object for equality.

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedMutation.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.firebase.dataconnect.generated
1818

19+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
1920
import com.google.firebase.dataconnect.FirebaseDataConnect
20-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
2121
import com.google.firebase.dataconnect.MutationRef
2222
import kotlinx.serialization.DeserializationStrategy
2323
import kotlinx.serialization.SerializationStrategy
@@ -51,20 +51,20 @@ public interface GeneratedMutation<Connector : GeneratedConnector<Connector>, Da
5151
callerSdkType = FirebaseDataConnect.CallerSdkType.Generated
5252
}
5353

54-
@FirebaseDataConnectExperimental
54+
@ExperimentalFirebaseDataConnect
5555
override fun copy(
5656
connector: Connector,
5757
operationName: String,
5858
dataDeserializer: DeserializationStrategy<Data>,
5959
variablesSerializer: SerializationStrategy<Variables>,
6060
): GeneratedMutation<Connector, Data, Variables>
6161

62-
@FirebaseDataConnectExperimental
62+
@ExperimentalFirebaseDataConnect
6363
override fun <NewVariables> withVariablesSerializer(
6464
variablesSerializer: SerializationStrategy<NewVariables>,
6565
): GeneratedMutation<Connector, Data, NewVariables>
6666

67-
@FirebaseDataConnectExperimental
67+
@ExperimentalFirebaseDataConnect
6868
override fun <NewData> withDataDeserializer(
6969
dataDeserializer: DeserializationStrategy<NewData>,
7070
): GeneratedMutation<Connector, NewData, Variables>

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedOperation.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.firebase.dataconnect.generated
1818

19-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
19+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
2020
import com.google.firebase.dataconnect.OperationRef
2121
import com.google.firebase.dataconnect.copy
2222
import kotlinx.serialization.DeserializationStrategy
@@ -78,7 +78,7 @@ public interface GeneratedOperation<Connector : GeneratedConnector<Connector>, D
7878
* @see withDataDeserializer
7979
* @see withVariablesSerializer
8080
*/
81-
@FirebaseDataConnectExperimental
81+
@ExperimentalFirebaseDataConnect
8282
public fun copy(
8383
connector: Connector = this.connector,
8484
operationName: String = this.operationName,
@@ -93,7 +93,7 @@ public interface GeneratedOperation<Connector : GeneratedConnector<Connector>, D
9393
* @see copy
9494
* @see withDataDeserializer
9595
*/
96-
@FirebaseDataConnectExperimental
96+
@ExperimentalFirebaseDataConnect
9797
public fun <NewVariables> withVariablesSerializer(
9898
variablesSerializer: SerializationStrategy<NewVariables>,
9999
): GeneratedOperation<Connector, Data, NewVariables>
@@ -105,7 +105,7 @@ public interface GeneratedOperation<Connector : GeneratedConnector<Connector>, D
105105
* @see copy
106106
* @see withVariablesSerializer
107107
*/
108-
@FirebaseDataConnectExperimental
108+
@ExperimentalFirebaseDataConnect
109109
public fun <NewData> withDataDeserializer(
110110
dataDeserializer: DeserializationStrategy<NewData>,
111111
): GeneratedOperation<Connector, NewData, Variables>

‎firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/generated/GeneratedQuery.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.firebase.dataconnect.generated
1818

19+
import com.google.firebase.dataconnect.ExperimentalFirebaseDataConnect
1920
import com.google.firebase.dataconnect.FirebaseDataConnect
20-
import com.google.firebase.dataconnect.FirebaseDataConnectExperimental
2121
import com.google.firebase.dataconnect.QueryRef
2222
import kotlinx.serialization.DeserializationStrategy
2323
import kotlinx.serialization.SerializationStrategy
@@ -51,20 +51,20 @@ public interface GeneratedQuery<Connector : GeneratedConnector<Connector>, Data,
5151
callerSdkType = FirebaseDataConnect.CallerSdkType.Generated
5252
}
5353

54-
@FirebaseDataConnectExperimental
54+
@ExperimentalFirebaseDataConnect
5555
override fun copy(
5656
connector: Connector,
5757
operationName: String,
5858
dataDeserializer: DeserializationStrategy<Data>,
5959
variablesSerializer: SerializationStrategy<Variables>,
6060
): GeneratedQuery<Connector, Data, Variables>
6161

62-
@FirebaseDataConnectExperimental
62+
@ExperimentalFirebaseDataConnect
6363
override fun <NewVariables> withVariablesSerializer(
6464
variablesSerializer: SerializationStrategy<NewVariables>,
6565
): GeneratedQuery<Connector, Data, NewVariables>
6666

67-
@FirebaseDataConnectExperimental
67+
@ExperimentalFirebaseDataConnect
6868
override fun <NewData> withDataDeserializer(
6969
dataDeserializer: DeserializationStrategy<NewData>,
7070
): GeneratedQuery<Connector, NewData, Variables>

0 commit comments

Comments
 (0)