Improve visibility of public/internal APIs

build.gradle.kts

@@ -32,6 +32,7 @@ apiValidation {
     klib {
         enabled = true
     }
+    nonPublicMarkers.add("kotlin.PublishedApi")
 }
 
 tasks.register("clean", Delete::class) {

resaca/api/resaca.api

@@ -1,7 +1,3 @@
-public final class com/sebaslogen/resaca/ComposeLifecycleObservers_androidKt {
-	public static final fun ObserveComposableContainerLifecycle (Lcom/sebaslogen/resaca/ScopedViewModelContainer;Landroidx/compose/runtime/Composer;I)V
-}
-
 public final class com/sebaslogen/resaca/PlatformLifecycleHandler {
 	public static final field $stable I
 	public fun <init> ()V
@@ -41,9 +37,6 @@ public final class com/sebaslogen/resaca/ScopedKeyInScopeResolverKt {
 }
 
 public final class com/sebaslogen/resaca/ScopedMemoizersKt {
-	public static final fun ObserveComposableDisposal-ITkcjrk (Ljava/lang/String;Lcom/sebaslogen/resaca/ScopedViewModelContainer;Landroidx/compose/runtime/Composer;I)V
-	public static final fun ObserveLifecycleWithScopedViewModelContainer (Lcom/sebaslogen/resaca/ScopedViewModelContainer;Landroidx/compose/runtime/Composer;I)V
-	public static final fun ObserveLifecycles-4iTggeE (Lcom/sebaslogen/resaca/ScopedViewModelContainer;Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V
 	public static final fun generateKeysAndObserveLifecycle (Ljava/lang/Object;Landroidx/compose/runtime/Composer;I)Lkotlin/Triple;
 	public static final fun rememberScoped (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)Ljava/lang/Object;
 	public static final fun rememberScoped (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)Ljava/lang/Object;
@@ -92,6 +85,5 @@ public final class com/sebaslogen/resaca/ScopedViewModelContainer$InternalKey :
 public final class com/sebaslogen/resaca/ScopedViewModelOwner {
 	public static final field $stable I
 	public fun <init> (Ljava/lang/String;Lkotlin/reflect/KClass;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;Landroidx/lifecycle/ViewModelStoreOwner;)V
-	public final fun updateViewModelProvider (Landroidx/lifecycle/ViewModelStoreOwner;)V
 }
 

resaca/api/resaca.klib.api

@@ -8,8 +8,6 @@
 // Library unique name: <io.github.sebaslogen:resaca>
 final class <#A: androidx.lifecycle/ViewModel> com.sebaslogen.resaca/ScopedViewModelOwner { // com.sebaslogen.resaca/ScopedViewModelOwner|null[0]
     constructor <init>(kotlin/String, kotlin.reflect/KClass<#A>, androidx.lifecycle/ViewModelProvider.Factory?, androidx.lifecycle.viewmodel/CreationExtras, androidx.lifecycle/ViewModelStoreOwner) // com.sebaslogen.resaca/ScopedViewModelOwner.<init>|<init>(kotlin.String;kotlin.reflect.KClass<1:0>;androidx.lifecycle.ViewModelProvider.Factory?;androidx.lifecycle.viewmodel.CreationExtras;androidx.lifecycle.ViewModelStoreOwner){}[0]
-
-    final fun updateViewModelProvider(androidx.lifecycle/ViewModelStoreOwner) // com.sebaslogen.resaca/ScopedViewModelOwner.updateViewModelProvider|updateViewModelProvider(androidx.lifecycle.ViewModelStoreOwner){}[0]
 }
 
 final class <#A: kotlin/Any> com.sebaslogen.resaca/ScopeKeyWithResolver { // com.sebaslogen.resaca/ScopeKeyWithResolver|null[0]
@@ -90,8 +88,6 @@ final fun <#A: kotlin/Any, #B: kotlin/Any> com.sebaslogen.resaca/rememberScoped(
 final fun <#A: kotlin/Any> com.sebaslogen.resaca/rememberKeysInScope(kotlin.collections/Collection<#A>, androidx.compose.runtime/Composer?, kotlin/Int): kotlin/Function1<#A, kotlin/Boolean> // com.sebaslogen.resaca/rememberKeysInScope|rememberKeysInScope(kotlin.collections.Collection<0:0>;androidx.compose.runtime.Composer?;kotlin.Int){0§<kotlin.Any>}[0]
 final fun <#A: kotlin/Any> com.sebaslogen.resaca/rememberScoped(kotlin/Any?, kotlin/Function0<#A>, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/rememberScoped|rememberScoped(kotlin.Any?;kotlin.Function0<0:0>;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<kotlin.Any>}[0]
 final fun com.sebaslogen.resaca.viewmodel/com_sebaslogen_resaca_viewmodel_DefaultViewModelProviderFactory$stableprop_getter(): kotlin/Int // com.sebaslogen.resaca.viewmodel/com_sebaslogen_resaca_viewmodel_DefaultViewModelProviderFactory$stableprop_getter|com_sebaslogen_resaca_viewmodel_DefaultViewModelProviderFactory$stableprop_getter(){}[0]
-final fun com.sebaslogen.resaca/ObserveComposableContainerLifecycle(com.sebaslogen.resaca/ScopedViewModelContainer, androidx.compose.runtime/Composer?, kotlin/Int) // com.sebaslogen.resaca/ObserveComposableContainerLifecycle|ObserveComposableContainerLifecycle(com.sebaslogen.resaca.ScopedViewModelContainer;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
-final fun com.sebaslogen.resaca/ObserveLifecycleWithScopedViewModelContainer(com.sebaslogen.resaca/ScopedViewModelContainer, androidx.compose.runtime/Composer?, kotlin/Int) // com.sebaslogen.resaca/ObserveLifecycleWithScopedViewModelContainer|ObserveLifecycleWithScopedViewModelContainer(com.sebaslogen.resaca.ScopedViewModelContainer;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
 final fun com.sebaslogen.resaca/com_sebaslogen_resaca_PlatformLifecycleHandler$stableprop_getter(): kotlin/Int // com.sebaslogen.resaca/com_sebaslogen_resaca_PlatformLifecycleHandler$stableprop_getter|com_sebaslogen_resaca_PlatformLifecycleHandler$stableprop_getter(){}[0]
 final fun com.sebaslogen.resaca/com_sebaslogen_resaca_RememberScopedObserver$stableprop_getter(): kotlin/Int // com.sebaslogen.resaca/com_sebaslogen_resaca_RememberScopedObserver$stableprop_getter|com_sebaslogen_resaca_RememberScopedObserver$stableprop_getter(){}[0]
 final fun com.sebaslogen.resaca/com_sebaslogen_resaca_ScopeKeyWithResolver$stableprop_getter(): kotlin/Int // com.sebaslogen.resaca/com_sebaslogen_resaca_ScopeKeyWithResolver$stableprop_getter|com_sebaslogen_resaca_ScopeKeyWithResolver$stableprop_getter(){}[0]
@@ -104,5 +100,3 @@ final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.
 final inline fun <#A: reified androidx.lifecycle/ViewModel, #B: kotlin/Any> com.sebaslogen.resaca/viewModelScoped(#B, noinline kotlin/Function1<#B, kotlin/Boolean>, androidx.core.bundle/Bundle?, noinline kotlin/Function0<#A>, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(0:1;kotlin.Function1<0:1,kotlin.Boolean>;androidx.core.bundle.Bundle?;kotlin.Function0<0:0>;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<androidx.lifecycle.ViewModel>;1§<kotlin.Any>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel> com.sebaslogen.resaca/viewModelScoped(kotlin/Any?, androidx.core.bundle/Bundle?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(kotlin.Any?;androidx.core.bundle.Bundle?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<androidx.lifecycle.ViewModel>}[0]
 final inline fun <#A: reified androidx.lifecycle/ViewModel> com.sebaslogen.resaca/viewModelScoped(kotlin/Any?, androidx.core.bundle/Bundle?, noinline kotlin/Function0<#A>, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.sebaslogen.resaca/viewModelScoped|viewModelScoped(kotlin.Any?;androidx.core.bundle.Bundle?;kotlin.Function0<0:0>;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§<androidx.lifecycle.ViewModel>}[0]
-final inline fun com.sebaslogen.resaca/ObserveComposableDisposal(com.sebaslogen.resaca/ScopedViewModelContainer.InternalKey, com.sebaslogen.resaca/ScopedViewModelContainer, androidx.compose.runtime/Composer?, kotlin/Int) // com.sebaslogen.resaca/ObserveComposableDisposal|ObserveComposableDisposal(com.sebaslogen.resaca.ScopedViewModelContainer.InternalKey;com.sebaslogen.resaca.ScopedViewModelContainer;androidx.compose.runtime.Composer?;kotlin.Int){}[0]
-final inline fun com.sebaslogen.resaca/ObserveLifecycles(com.sebaslogen.resaca/ScopedViewModelContainer, com.sebaslogen.resaca/ScopedViewModelContainer.InternalKey, androidx.compose.runtime/Composer?, kotlin/Int) // com.sebaslogen.resaca/ObserveLifecycles|ObserveLifecycles(com.sebaslogen.resaca.ScopedViewModelContainer;com.sebaslogen.resaca.ScopedViewModelContainer.InternalKey;androidx.compose.runtime.Composer?;kotlin.Int){}[0]

resaca/src/androidMain/kotlin/com/sebaslogen/resaca/ComposeLifecycleObservers.android.kt

@@ -8,7 +8,8 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.platform.LocalContext
 
 @Composable
-public actual fun ObserveComposableContainerLifecycle(scopedViewModelContainer: ScopedViewModelContainer) {
+@PublishedApi
+internal actual fun ObserveComposableContainerLifecycle(scopedViewModelContainer: ScopedViewModelContainer) {
     // Observe state of configuration changes when disposing
     val context = LocalContext.current
     DisposableEffect(context) {

resaca/src/commonMain/kotlin/com/sebaslogen/resaca/ComposeLifecycleObservers.kt

@@ -3,4 +3,5 @@ package com.sebaslogen.resaca
 import androidx.compose.runtime.Composable
 
 @Composable
-public expect fun ObserveComposableContainerLifecycle(scopedViewModelContainer: ScopedViewModelContainer)
+@PublishedApi
+internal expect fun ObserveComposableContainerLifecycle(scopedViewModelContainer: ScopedViewModelContainer)

resaca/src/iosMain/kotlin/com/sebaslogen/resaca/ComposeLifecycleObservers.ios.kt

@@ -3,5 +3,6 @@ package com.sebaslogen.resaca
 import androidx.compose.runtime.Composable
 
 @Composable
-actual fun ObserveComposableContainerLifecycle(scopedViewModelContainer: ScopedViewModelContainer) {
+@PublishedApi
+internal actual fun ObserveComposableContainerLifecycle(scopedViewModelContainer: ScopedViewModelContainer) {
 }