From d2354ee3ef9eff19d0884e469ac12bf97154e249 Mon Sep 17 00:00:00 2001 From: Soren Roth Date: Mon, 4 Nov 2024 13:34:17 -0800 Subject: [PATCH 1/2] update api file --- .../utilitynetworks/api/utilitynetworks.api | 37 ++----------------- toolkit/utilitynetworks/build.gradle.kts | 9 ++++- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/toolkit/utilitynetworks/api/utilitynetworks.api b/toolkit/utilitynetworks/api/utilitynetworks.api index 4b0ba6d8c..82088485e 100644 --- a/toolkit/utilitynetworks/api/utilitynetworks.api +++ b/toolkit/utilitynetworks/api/utilitynetworks.api @@ -86,46 +86,17 @@ public final class com/arcgismaps/toolkit/utilitynetworks/TraceKt { public final class com/arcgismaps/toolkit/utilitynetworks/TraceState { public static final field $stable I public fun (Lcom/arcgismaps/mapping/ArcGISMap;Lcom/arcgismaps/mapping/view/GraphicsOverlay;Lcom/arcgismaps/toolkit/geoviewcompose/MapViewProxy;)V + public final fun addStartingPoint (Lcom/arcgismaps/data/ArcGISFeature;Lcom/arcgismaps/geometry/Point;)V public final fun addStartingPoint (Lcom/arcgismaps/geometry/Point;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun addStartingPoint$default (Lcom/arcgismaps/toolkit/utilitynetworks/TraceState;Lcom/arcgismaps/data/ArcGISFeature;Lcom/arcgismaps/geometry/Point;ILjava/lang/Object;)V public final fun getAddStartingPointMode ()Landroidx/compose/runtime/State; public final fun getInitializationStatus ()Landroidx/compose/runtime/State; - public final fun getSelectedTraceConfiguration ()Landroidx/compose/runtime/State; -} - -public final class com/arcgismaps/toolkit/utilitynetworks/ui/ComposableSingletons$AddStartingPointScreenKt { - public static final field INSTANCE Lcom/arcgismaps/toolkit/utilitynetworks/ui/ComposableSingletons$AddStartingPointScreenKt; - public static field lambda-1 Lkotlin/jvm/functions/Function3; - public fun ()V - public final fun getLambda-1$utilitynetworks_release ()Lkotlin/jvm/functions/Function3; -} - -public final class com/arcgismaps/toolkit/utilitynetworks/ui/ComposableSingletons$TraceOptionsScreenKt { - public static final field INSTANCE Lcom/arcgismaps/toolkit/utilitynetworks/ui/ComposableSingletons$TraceOptionsScreenKt; - public static field lambda-1 Lkotlin/jvm/functions/Function3; - public static field lambda-2 Lkotlin/jvm/functions/Function3; - public static field lambda-3 Lkotlin/jvm/functions/Function2; - public static field lambda-4 Lkotlin/jvm/functions/Function3; - public static field lambda-5 Lkotlin/jvm/functions/Function2; - public fun ()V - public final fun getLambda-1$utilitynetworks_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$utilitynetworks_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$utilitynetworks_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-4$utilitynetworks_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-5$utilitynetworks_release ()Lkotlin/jvm/functions/Function2; } public final class com/arcgismaps/toolkit/utilitynetworks/ui/ComposableSingletons$TraceResultScreenKt { public static final field INSTANCE Lcom/arcgismaps/toolkit/utilitynetworks/ui/ComposableSingletons$TraceResultScreenKt; - public static field lambda-1 Lkotlin/jvm/functions/Function2; - public static field lambda-2 Lkotlin/jvm/functions/Function2; - public static field lambda-3 Lkotlin/jvm/functions/Function2; - public static field lambda-4 Lkotlin/jvm/functions/Function2; - public static field lambda-5 Lkotlin/jvm/functions/Function3; + public static field lambda-1 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$utilitynetworks_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-2$utilitynetworks_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-3$utilitynetworks_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-4$utilitynetworks_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-5$utilitynetworks_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$utilitynetworks_release ()Lkotlin/jvm/functions/Function3; } diff --git a/toolkit/utilitynetworks/build.gradle.kts b/toolkit/utilitynetworks/build.gradle.kts index 70e377593..404416132 100644 --- a/toolkit/utilitynetworks/build.gradle.kts +++ b/toolkit/utilitynetworks/build.gradle.kts @@ -88,7 +88,14 @@ apiValidation { // compiler. val composableSingletons = listOf( "com.arcgismaps.toolkit.utilitynetworks.ComposableSingletons\$TraceKt", - "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceOptionsKt" + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceOptionsKt", + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceOptionsScreenKt", + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceResultsScreenKt", + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$AddStartingPointScreenKt", + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$StartingPointDetailsScreenKt", + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$ClearAllResultsDialogKt", + "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceErrorDialogKt", + "com.arcgismaps.toolkit.utilitynetworks.internal.util.ComposableSingletons\$TitleRowKt" ) ignoredClasses.addAll(composableSingletons) From 41dc550880e78a3fd1e1d527aabc892e576ab88b Mon Sep 17 00:00:00 2001 From: Soren Roth Date: Mon, 4 Nov 2024 13:45:54 -0800 Subject: [PATCH 2/2] add BuildConfig to api file ignores --- toolkit/utilitynetworks/api/utilitynetworks.api | 13 ------------- toolkit/utilitynetworks/build.gradle.kts | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/toolkit/utilitynetworks/api/utilitynetworks.api b/toolkit/utilitynetworks/api/utilitynetworks.api index 82088485e..1a966a747 100644 --- a/toolkit/utilitynetworks/api/utilitynetworks.api +++ b/toolkit/utilitynetworks/api/utilitynetworks.api @@ -26,19 +26,6 @@ public final class com/arcgismaps/toolkit/utilitynetworks/AddStartingPointMode$S public fun toString ()Ljava/lang/String; } -public final class com/arcgismaps/toolkit/utilitynetworks/BuildConfig { - public static final field API_KEY Ljava/lang/String; - public static final field BUILD_TYPE Ljava/lang/String; - public static final field DEBUG Z - public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; - public static final field clientId Ljava/lang/String; - public static final field traceToolPassword Ljava/lang/String; - public static final field traceToolUser Ljava/lang/String; - public static final field webMapPassword Ljava/lang/String; - public static final field webMapUser Ljava/lang/String; - public fun ()V -} - public abstract class com/arcgismaps/toolkit/utilitynetworks/InitializationStatus { public static final field $stable I } diff --git a/toolkit/utilitynetworks/build.gradle.kts b/toolkit/utilitynetworks/build.gradle.kts index 404416132..18ffa1901 100644 --- a/toolkit/utilitynetworks/build.gradle.kts +++ b/toolkit/utilitynetworks/build.gradle.kts @@ -87,6 +87,7 @@ apiValidation { // compose compiler generates public singletons for internal compose functions. this may be resolved in the compose // compiler. val composableSingletons = listOf( + "com.arcgismaps.toolkit.utilitynetworks.BuildConfig", "com.arcgismaps.toolkit.utilitynetworks.ComposableSingletons\$TraceKt", "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceOptionsKt", "com.arcgismaps.toolkit.utilitynetworks.ui.ComposableSingletons\$TraceOptionsScreenKt",