Make ExpiringExecutableFlowDataSource open so we can subclass it with…

… our own datasource types. (#217)
mirego · Feb 5, 2024 · 0cccfb4 · 0cccfb4
1 parent 9112044
commit 0cccfb4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+ruby 2.7.5
diff --git a/trikot-datasources/datasources-flow/api/android/datasources-flow.api b/trikot-datasources/datasources-flow/api/android/datasources-flow.api
@@ -50,10 +50,11 @@ public final class com/mirego/trikot/datasources/flow/ExecutableFlowDataSourceRe
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/mirego/trikot/datasources/flow/ExpiringExecutableFlowDataSource : com/mirego/trikot/datasources/flow/BaseExpiringExecutableFlowDataSource {
+public class com/mirego/trikot/datasources/flow/ExpiringExecutableFlowDataSource : com/mirego/trikot/datasources/flow/BaseExpiringExecutableFlowDataSource {
 	public fun <init> ()V
 	public fun <init> (Lcom/mirego/trikot/datasources/flow/FlowDataSource;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lcom/mirego/trikot/datasources/flow/FlowDataSource;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected fun internalRead (Lcom/mirego/trikot/datasources/flow/ExpiringExecutableFlowDataSourceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun internalRead (Lcom/mirego/trikot/datasources/flow/FlowDataSourceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 

diff --git a/trikot-datasources/datasources-flow/api/jvm/datasources-flow.api b/trikot-datasources/datasources-flow/api/jvm/datasources-flow.api
@@ -50,10 +50,11 @@ public final class com/mirego/trikot/datasources/flow/ExecutableFlowDataSourceRe
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/mirego/trikot/datasources/flow/ExpiringExecutableFlowDataSource : com/mirego/trikot/datasources/flow/BaseExpiringExecutableFlowDataSource {
+public class com/mirego/trikot/datasources/flow/ExpiringExecutableFlowDataSource : com/mirego/trikot/datasources/flow/BaseExpiringExecutableFlowDataSource {
 	public fun <init> ()V
 	public fun <init> (Lcom/mirego/trikot/datasources/flow/FlowDataSource;Lkotlin/coroutines/CoroutineContext;)V
 	public synthetic fun <init> (Lcom/mirego/trikot/datasources/flow/FlowDataSource;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected fun internalRead (Lcom/mirego/trikot/datasources/flow/ExpiringExecutableFlowDataSourceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun internalRead (Lcom/mirego/trikot/datasources/flow/FlowDataSourceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 

diff --git a/.../commonMain/kotlin/com/mirego/trikot/datasources/flow/ExecutableExpiringFlowDataSource.kt b/.../commonMain/kotlin/com/mirego/trikot/datasources/flow/ExecutableExpiringFlowDataSource.kt
@@ -11,7 +11,7 @@ data class ExpiringExecutableFlowDataSourceRequest<T>(
     val block: suspend () -> T
 ) : ExpiringFlowDataSourceRequest
 
-class ExpiringExecutableFlowDataSource<T>(
+open class ExpiringExecutableFlowDataSource<T>(
     cacheDataSource: FlowDataSource<ExpiringExecutableFlowDataSourceRequest<T>, FlowDataSourceExpiringValue<T>>? = null,
     coroutineContext: CoroutineContext = EmptyCoroutineContext
 ) : BaseExpiringExecutableFlowDataSource<ExpiringExecutableFlowDataSourceRequest<T>, T>(cacheDataSource, coroutineContext) {