Merge branch 'master' into compose-experimental

deps.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-decompose = "2.1.1-compose-experimental"
+decompose = "2.1.2-compose-experimental"
 kotlin = "1.9.10"
 essenty = "1.2.0"
 parcelizeDarwin = "0.2.1"

extensions-compose-jetbrains/src/commonMain/kotlin/com/arkivanov/decompose/extensions/compose/jetbrains/pages/Pages.kt

@@ -14,6 +14,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.ExperimentalDecomposeApi
 import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
+import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.router.pages.ChildPages
 import com.arkivanov.decompose.value.Value
 
@@ -82,7 +83,7 @@ fun <T : Any> Pages(
  pager(
  modifier,
  state,
- { childPages.items[it].configuration },
+ { childPages.items[it].configuration.hashString() },
  ) { pageIndex ->
  childPages.items[pageIndex].instance?.also { page ->
  pageContent(pageIndex, page)

extensions-compose-jetpack/build/.transforms/60f954f816e03abf4a3406283ebf0e36/results.bin

@@ -0,0 +1 @@
+o/out

extensions-compose-jetpack/build/.transforms/60f954f816e03abf4a3406283ebf0e36/transformed/out/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.arkivanov.decompose.extensions.compose.jetpack" >
+
+ <uses-sdk android:minSdkVersion="21" />
+
+</manifest>

extensions-compose-jetpack/build/.transforms/60f954f816e03abf4a3406283ebf0e36/transformed/out/META-INF/com/android/build/gradle/aar-metadata.properties

@@ -0,0 +1,5 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minCompileSdkExtension=0
+minAndroidGradlePluginVersion=1.0.0

extensions-compose-jetpack/build/api/extensions-compose-jetpack.api

@@ -0,0 +1,113 @@
+public final class com/arkivanov/decompose/extensions/compose/jetpack/SubscribeAsStateKt {
+ public static final fun subscribeAsState (Lcom/arkivanov/decompose/value/Value;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/pages/ComposableSingletons$PagesKt {
+ public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/jetpack/pages/ComposableSingletons$PagesKt;
+ public static field lambda-1 Lkotlin/jvm/functions/Function6;
+ public static field lambda-2 Lkotlin/jvm/functions/Function6;
+ public fun <init> ()V
+ public final fun getLambda-1$extensions_compose_jetpack_release ()Lkotlin/jvm/functions/Function6;
+ public final fun getLambda-2$extensions_compose_jetpack_release ()Lkotlin/jvm/functions/Function6;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesKt {
+ public static final fun Pages (Landroidx/compose/runtime/State;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lcom/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation;Lkotlin/jvm/functions/Function6;Lkotlin/jvm/functions/Function5;Landroidx/compose/runtime/Composer;II)V
+ public static final fun Pages (Lcom/arkivanov/decompose/value/Value;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Lcom/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation;Lkotlin/jvm/functions/Function6;Lkotlin/jvm/functions/Function5;Landroidx/compose/runtime/Composer;II)V
+ public static final fun defaultHorizontalPager ()Lkotlin/jvm/functions/Function6;
+ public static final fun defaultVerticalPager ()Lkotlin/jvm/functions/Function6;
+}
+
+public abstract interface class com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation {
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation$Custom : com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation {
+ public static final field $stable I
+ public fun <init> (Landroidx/compose/animation/core/AnimationSpec;)V
+ public final fun getSpec ()Landroidx/compose/animation/core/AnimationSpec;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation$Default : com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation {
+ public static final field $stable I
+ public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation$Default;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation$Disabled : com/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation {
+ public static final field $stable I
+ public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/jetpack/pages/PagesScrollAnimation$Disabled;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/ChildrenKt {
+ public static final fun Children (Lcom/arkivanov/decompose/router/stack/ChildStack;Landroidx/compose/ui/Modifier;Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+ public static final fun Children (Lcom/arkivanov/decompose/value/Value;Landroidx/compose/ui/Modifier;Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/ComposableSingletons$SlideKt {
+ public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/ComposableSingletons$SlideKt;
+ public static field lambda-1 Lkotlin/jvm/functions/Function5;
+ public fun <init> ()V
+ public final fun getLambda-1$extensions_compose_jetpack_release ()Lkotlin/jvm/functions/Function5;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction : java/lang/Enum {
+ public static final field ENTER_BACK Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;
+ public static final field ENTER_FRONT Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;
+ public static final field EXIT_BACK Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;
+ public static final field EXIT_FRONT Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;
+ public static fun getEntries ()Lkotlin/enums/EnumEntries;
+ public static fun valueOf (Ljava/lang/String;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;
+ public static fun values ()[Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/DirectionKt {
+ public static final fun isBack (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;)Z
+ public static final fun isEnter (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;)Z
+ public static final fun isExit (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;)Z
+ public static final fun isFront (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;)Z
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/FadeKt {
+ public static final fun fade (Landroidx/compose/animation/core/FiniteAnimationSpec;F)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static synthetic fun fade$default (Landroidx/compose/animation/core/FiniteAnimationSpec;FILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/PredictiveBackAnimationKt {
+ public static final fun predictiveBackAnimation (Lcom/arkivanov/essenty/backhandler/BackHandler;Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+ public static synthetic fun predictiveBackAnimation$default (Lcom/arkivanov/essenty/backhandler/BackHandler;Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/ScaleKt {
+ public static final fun scale (Landroidx/compose/animation/core/FiniteAnimationSpec;FF)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static synthetic fun scale$default (Landroidx/compose/animation/core/FiniteAnimationSpec;FFILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/SlideKt {
+ public static final synthetic fun slide (Landroidx/compose/animation/core/FiniteAnimationSpec;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static final fun slide (Landroidx/compose/animation/core/FiniteAnimationSpec;Landroidx/compose/foundation/gestures/Orientation;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static synthetic fun slide$default (Landroidx/compose/animation/core/FiniteAnimationSpec;ILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static synthetic fun slide$default (Landroidx/compose/animation/core/FiniteAnimationSpec;Landroidx/compose/foundation/gestures/Orientation;ILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+}
+
+public abstract interface class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation {
+ public abstract fun invoke (Lcom/arkivanov/decompose/router/stack/ChildStack;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimationKt {
+ public static final fun stackAnimation (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;Z)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+ public static final fun stackAnimation (ZLkotlin/jvm/functions/Function1;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+ public static final fun stackAnimation (ZLkotlin/jvm/functions/Function3;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+ public static synthetic fun stackAnimation$default (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;ZILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+ public static synthetic fun stackAnimation$default (ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+ public static synthetic fun stackAnimation$default (ZLkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimation;
+}
+
+public abstract interface class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator {
+ public abstract fun invoke (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/Direction;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
+}
+
+public final class com/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimatorKt {
+ public static final fun plus (Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static final fun stackAnimator (Landroidx/compose/animation/core/FiniteAnimationSpec;Lkotlin/jvm/functions/Function5;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+ public static synthetic fun stackAnimator$default (Landroidx/compose/animation/core/FiniteAnimationSpec;Lkotlin/jvm/functions/Function5;ILjava/lang/Object;)Lcom/arkivanov/decompose/extensions/compose/jetpack/stack/animation/StackAnimator;
+}
+

extensions-compose-jetpack/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.arkivanov.decompose.extensions.compose.jetpack" >
+
+ <uses-sdk android:minSdkVersion="21" />
+
+</manifest>

extensions-compose-jetpack/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json

@@ -0,0 +1,18 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "com.arkivanov.decompose.extensions.compose.jetpack",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "outputFile": "AndroidManifest.xml"
+ }
+ ],
+ "elementType": "File"
+}

extensions-compose-jetpack/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.arkivanov.decompose.extensions.compose.jetpack" >
+
+ <uses-sdk android:minSdkVersion="21" />
+
+</manifest>

extensions-compose-jetpack/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output-metadata.json

@@ -0,0 +1,18 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "com.arkivanov.decompose.extensions.compose.jetpack",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "outputFile": "AndroidManifest.xml"
+ }
+ ],
+ "elementType": "File"
+}

extensions-compose-jetpack/build/intermediates/aar_metadata/debug/aar-metadata.properties

@@ -0,0 +1,5 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minCompileSdkExtension=0
+minAndroidGradlePluginVersion=1.0.0

extensions-compose-jetpack/build/intermediates/aar_metadata/release/aar-metadata.properties

@@ -0,0 +1,5 @@
+aarFormatVersion=1.0
+aarMetadataVersion=1.0
+minCompileSdk=1
+minCompileSdkExtension=0
+minAndroidGradlePluginVersion=1.0.0

extensions-compose-jetpack/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -0,0 +1 @@
+{}

extensions-compose-jetpack/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json

@@ -0,0 +1 @@
+{}

extensions-compose-jetpack/build/intermediates/annotation_processor_list/release/annotationProcessors.json

@@ -0,0 +1 @@
+{}

extensions-compose-jetpack/build/intermediates/annotation_processor_list/releaseUnitTest/annotationProcessors.json

@@ -0,0 +1 @@
+{}

extensions-compose-jetpack/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.0.2

@@ -0,0 +1,117 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+#
+# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
+# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
+# will be ignored by new version of the Android plugin for Gradle.
+
+# Optimizations: If you don't want to optimize, use the proguard-android.txt configuration file
+# instead of this one, which turns off the optimization flags.
+# Adding optimization introduces certain risks, since for example not all optimizations performed by
+# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations
+# known to have issues, but the list may not be complete or up to date. (The "arithmetic"
+# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test
+# thoroughly if you go this route.
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Preserve some attributes that may be required for reflection.
+-keepattributes AnnotationDefault,
+ EnclosingMethod,
+ InnerClasses,
+ RuntimeVisibleAnnotations,
+ RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,
+ Signature
+
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public class com.google.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+-dontnote com.google.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames,includedescriptorclasses class * {
+ native <methods>;
+}
+
+# Keep setters in Views so that animations can still work.
+-keepclassmembers public class * extends android.view.View {
+ void set*(***);
+ *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
+
+# Preserve annotated Javascript interface methods.
+-keepclassmembers class * {
+ @android.webkit.JavascriptInterface <methods>;
+}
+
+# The support libraries contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
+-dontnote androidx.**
+-dontwarn android.support.**
+-dontwarn androidx.**
+
+# This class is deprecated, but remains for backward compatibility.
+-dontwarn android.util.FloatMath
+
+# Understand the @Keep support annotation.
+-keep class android.support.annotation.Keep
+-keep class androidx.annotation.Keep
+
+-keep @android.support.annotation.Keep class * {*;}
+-keep @androidx.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep <methods>;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep <methods>;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep <fields>;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep <fields>;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep <init>(...);
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep <init>(...);
+}
+
+# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+
+# These classes are duplicated between android.jar and core-lambda-stubs.jar.
+-dontnote java.lang.invoke.**