Update kotlin 1.9.0 to v1.10.1 (#2492)

* Update kotlin 1.9.0 to v1.10.1 * update metalava --------- Co-authored-by: Mend Renovate <[email protected]>
google · Jan 6, 2025 · 0e0a7fa · 0e0a7fa
1 parent b28f900
commit 0e0a7fa
Show file tree

Hide file tree

Showing 64 changed files with 117 additions and 213 deletions.
diff --git a/ai/ui/build.gradle.kts b/ai/ui/build.gradle.kts
@@ -85,9 +85,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts
@@ -27,9 +27,7 @@ java {
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/auth/composables/build.gradle.kts b/auth/composables/build.gradle.kts
@@ -89,9 +89,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/auth/data-phone/build.gradle.kts b/auth/data-phone/build.gradle.kts
@@ -86,9 +86,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/auth/data/build.gradle.kts b/auth/data/build.gradle.kts
@@ -87,9 +87,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/auth/ui/build.gradle.kts b/auth/ui/build.gradle.kts
@@ -89,9 +89,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/composables/build.gradle.kts b/composables/build.gradle.kts
@@ -84,9 +84,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/compose-layout/api/current.api b/compose-layout/api/current.api
@@ -109,12 +109,10 @@ package com.google.android.horologist.compose.layout {
 
   public enum ScalingLazyColumnDefaults.ItemType implements com.google.android.horologist.compose.layout.ColumnItemType {
     method @androidx.compose.runtime.Composable public float bottomPadding(float horizontalPercent);
-    method public final float getBottomPaddingPct();
-    method public final float getPaddingCorrection();
-    method public final float getTopPaddingPct();
+    method public float getBottomPaddingPct();
+    method public float getPaddingCorrection();
+    method public float getTopPaddingPct();
     method @androidx.compose.runtime.Composable public float topPadding(float horizontalPercent);
-    method public static com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType[] values();
     property public final float bottomPaddingPct;
     property public final float paddingCorrection;
     property public final float topPaddingPct;
@@ -147,7 +145,7 @@ package com.google.android.horologist.compose.layout {
     method public boolean getUserScrollEnabled();
     method public androidx.compose.foundation.layout.Arrangement.Vertical getVerticalArrangement();
     method public boolean isScrollInProgress();
-    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public void setState(androidx.wear.compose.foundation.lazy.ScalingLazyListState);
     property public final int anchorType;
     property public final androidx.wear.compose.foundation.lazy.AutoCenteringParams? autoCentering;
@@ -206,7 +204,7 @@ package com.google.android.horologist.compose.layout {
 
   public final class ScrollAwayKt {
     method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, com.google.android.horologist.compose.layout.ScalingLazyColumnState scalingLazyColumnState);
-    method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function0<? extends androidx.compose.foundation.gestures.ScrollableState> scrollableState);
+    method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function0<? extends androidx.compose.foundation.gestures.ScrollableState?> scrollableState);
   }
 
   public final class TransformingLazyColumnDefaultsKt {
@@ -218,12 +216,12 @@ package com.google.android.horologist.compose.layout {
 package com.google.android.horologist.compose.nav {
 
   public final class TypeSafeKt {
-    method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, Object startDestination, optional androidx.compose.ui.Modifier modifier, optional boolean userSwipeEnabled, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state, optional kotlin.reflect.KClass<?>? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method @com.google.android.horologist.annotations.ExperimentalHorologistApi public static inline <reified T> void composable(androidx.navigation.NavGraphBuilder, optional java.util.Map<kotlin.reflect.KType,androidx.navigation.NavType<?>> typeMap, optional java.util.List<? extends androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,? extends kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, Object startDestination, optional androidx.compose.ui.Modifier modifier, optional boolean userSwipeEnabled, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state, optional kotlin.reflect.KClass<? extends java.lang.Object?>? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method @com.google.android.horologist.annotations.ExperimentalHorologistApi public static inline <reified T> void composable(androidx.navigation.NavGraphBuilder, optional java.util.Map<kotlin.reflect.KType,androidx.navigation.NavType<? extends java.lang.Object?>> typeMap, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
   }
 
   public final class WearComposeNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.wear.compose.navigation.WearNavigator.Destination> {
-    ctor public WearComposeNavigatorDestinationBuilder(androidx.wear.compose.navigation.WearNavigator wearNavigator, kotlin.reflect.KClass<?> route, java.util.Map<kotlin.reflect.KType,androidx.navigation.NavType<?>> typeMap, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+    ctor public WearComposeNavigatorDestinationBuilder(androidx.wear.compose.navigation.WearNavigator wearNavigator, kotlin.reflect.KClass<? extends java.lang.Object?> route, java.util.Map<kotlin.reflect.KType,androidx.navigation.NavType<? extends java.lang.Object?>> typeMap, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
     method public androidx.wear.compose.navigation.WearNavigator getWearNavigator();
     method protected androidx.wear.compose.navigation.WearNavigator.Destination instantiateDestination();
     property public final androidx.wear.compose.navigation.WearNavigator wearNavigator;
@@ -265,7 +263,7 @@ package com.google.android.horologist.compose.pager {
 package com.google.android.horologist.compose.paging {
 
   public final class ItemsKt {
-    method @com.google.android.horologist.annotations.ExperimentalHorologistApi public static <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, androidx.paging.compose.LazyPagingItems<T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+    method @com.google.android.horologist.annotations.ExperimentalHorologistApi public static <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, androidx.paging.compose.LazyPagingItems<T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T?,kotlin.Unit> itemContent);
   }
 
 }
@@ -362,8 +360,6 @@ package com.google.android.horologist.compose.snackbar {
   }
 
   public enum SnackbarDuration {
-    method public static com.google.android.horologist.compose.snackbar.SnackbarDuration valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static com.google.android.horologist.compose.snackbar.SnackbarDuration[] values();
     enum_constant public static final com.google.android.horologist.compose.snackbar.SnackbarDuration Indefinite;
     enum_constant public static final com.google.android.horologist.compose.snackbar.SnackbarDuration Long;
     enum_constant public static final com.google.android.horologist.compose.snackbar.SnackbarDuration Short;
@@ -372,7 +368,7 @@ package com.google.android.horologist.compose.snackbar {
   @androidx.compose.runtime.Stable public final class SnackbarHostState {
     ctor public SnackbarHostState();
     method public com.google.android.horologist.compose.snackbar.SnackbarData? getCurrentSnackbarData();
-    method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional com.google.android.horologist.compose.snackbar.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super com.google.android.horologist.compose.snackbar.SnackbarResult>);
+    method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional com.google.android.horologist.compose.snackbar.SnackbarDuration duration, kotlin.coroutines.Continuation<? super com.google.android.horologist.compose.snackbar.SnackbarResult>);
     property public final com.google.android.horologist.compose.snackbar.SnackbarData? currentSnackbarData;
   }
 
@@ -381,8 +377,6 @@ package com.google.android.horologist.compose.snackbar {
   }
 
   public enum SnackbarResult {
-    method public static com.google.android.horologist.compose.snackbar.SnackbarResult valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static com.google.android.horologist.compose.snackbar.SnackbarResult[] values();
     enum_constant public static final com.google.android.horologist.compose.snackbar.SnackbarResult ActionPerformed;
     enum_constant public static final com.google.android.horologist.compose.snackbar.SnackbarResult Dismissed;
   }

diff --git a/compose-layout/build.gradle.kts b/compose-layout/build.gradle.kts
@@ -79,9 +79,7 @@ android {
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/compose-material/build.gradle.kts b/compose-material/build.gradle.kts
@@ -94,9 +94,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {

diff --git a/...ose-material/src/test/java/com/google/android/horologist/compose/material/SLCTitleTest.kt b/...ose-material/src/test/java/com/google/android/horologist/compose/material/SLCTitleTest.kt
@@ -34,13 +34,15 @@ import androidx.wear.compose.material.LocalContentAlpha
 import androidx.wear.compose.material.LocalContentColor
 import androidx.wear.compose.material.LocalTextStyle
 import androidx.wear.compose.material.Text
+import androidx.wear.compose.material.TimeText
 import com.google.android.horologist.compose.layout.AppScaffold
 import com.google.android.horologist.compose.layout.ScalingLazyColumn
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.padding
 import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.layout.rememberResponsiveColumnState
 import com.google.android.horologist.compose.material.ListHeaderDefaults.firstItemPadding
+import com.google.android.horologist.screenshots.FixedTimeSource
 import com.google.android.horologist.screenshots.rng.WearDevice
 import com.google.android.horologist.screenshots.rng.WearDeviceScreenshotTest
 import org.junit.Test
@@ -67,7 +69,7 @@ class SLCTitleTest(device: WearDevice) : WearDeviceScreenshotTest(device) {
     fun listWithPadding(topPadding: ItemType) {
         runTest {
             Box {
-                AppScaffold {
+                AppScaffold(timeText = { TimeText(timeSource = FixedTimeSource) }) {
                     val columnState = rememberResponsiveColumnState(
                         contentPadding = padding(
                             first = topPadding,

diff --git a/...ose-material/src/test/screenshots/SLCTitleTest_padding_16[0]_ticwatch_pro_5.png b/...ose-material/src/test/screenshots/SLCTitleTest_padding_16[0]_ticwatch_pro_5.png
diff --git a/...ose-material/src/test/screenshots/SLCTitleTest_padding_16[1]_galaxy_watch_5.png b/...ose-material/src/test/screenshots/SLCTitleTest_padding_16[1]_galaxy_watch_5.png
diff --git a/...ose-material/src/test/screenshots/SLCTitleTest_padding_16[2]_galaxy_watch_6.png b/...ose-material/src/test/screenshots/SLCTitleTest_padding_16[2]_galaxy_watch_6.png
diff --git a/compose-material/src/test/screenshots/SLCTitleTest_padding_16[3]_pixel_watch.png b/compose-material/src/test/screenshots/SLCTitleTest_padding_16[3]_pixel_watch.png
diff --git a/compose-material/src/test/screenshots/SLCTitleTest_padding_16[4]_small_round.png b/compose-material/src/test/screenshots/SLCTitleTest_padding_16[4]_small_round.png
diff --git a/compose-material/src/test/screenshots/SLCTitleTest_padding_16[5]_large_round.png b/compose-material/src/test/screenshots/SLCTitleTest_padding_16[5]_large_round.png
diff --git a/...l/src/test/screenshots/SLCTitleTest_padding_16[6]_galaxy_watch_6_small_font.png b/...l/src/test/screenshots/SLCTitleTest_padding_16[6]_galaxy_watch_6_small_font.png
diff --git a/...rial/src/test/screenshots/SLCTitleTest_padding_16[7]_pixel_watch_large_font.png b/...rial/src/test/screenshots/SLCTitleTest_padding_16[7]_pixel_watch_large_font.png
diff --git a/...ose-material/src/test/screenshots/SLCTitleTest_padding_21[0]_ticwatch_pro_5.png b/...ose-material/src/test/screenshots/SLCTitleTest_padding_21[0]_ticwatch_pro_5.png
diff --git a/...ose-material/src/test/screenshots/SLCTitleTest_padding_21[1]_galaxy_watch_5.png b/...ose-material/src/test/screenshots/SLCTitleTest_padding_21[1]_galaxy_watch_5.png
diff --git a/...ose-material/src/test/screenshots/SLCTitleTest_padding_21[2]_galaxy_watch_6.png b/...ose-material/src/test/screenshots/SLCTitleTest_padding_21[2]_galaxy_watch_6.png
diff --git a/compose-material/src/test/screenshots/SLCTitleTest_padding_21[3]_pixel_watch.png b/compose-material/src/test/screenshots/SLCTitleTest_padding_21[3]_pixel_watch.png
diff --git a/compose-material/src/test/screenshots/SLCTitleTest_padding_21[4]_small_round.png b/compose-material/src/test/screenshots/SLCTitleTest_padding_21[4]_small_round.png
diff --git a/compose-material/src/test/screenshots/SLCTitleTest_padding_21[5]_large_round.png b/compose-material/src/test/screenshots/SLCTitleTest_padding_21[5]_large_round.png
diff --git a/...l/src/test/screenshots/SLCTitleTest_padding_21[6]_galaxy_watch_6_small_font.png b/...l/src/test/screenshots/SLCTitleTest_padding_21[6]_galaxy_watch_6_small_font.png
diff --git a/...rial/src/test/screenshots/SLCTitleTest_padding_21[7]_pixel_watch_large_font.png b/...rial/src/test/screenshots/SLCTitleTest_padding_21[7]_pixel_watch_large_font.png
diff --git a/compose-tools/build.gradle.kts b/compose-tools/build.gradle.kts
@@ -78,9 +78,7 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config
 }
 
 metalava {
-    sourcePaths.setFrom("src/main")
     filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
 }
 
 dependencies {