Update dependencies

leinardi · Jul 12, 2023 · bd954e6 · bd954e6
1 parent 8434194
commit bd954e6
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 9 deletions.
diff --git a/apps/forlago/versions/dependencies/benchmarkRuntimeClasspathDependencies.txt b/apps/forlago/versions/dependencies/benchmarkRuntimeClasspathDependencies.txt
@@ -1034,7 +1034,8 @@ benchmarkRuntimeClasspath - Runtime classpath of /benchmark.
 |    |    |    |         +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 |    |    |    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 |    |    |    |         +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         \--- androidx.compose.material3:material3-window-size-class:1.2.0-alpha03 (c)
 |    |    |    +--- io.github.aakira:napier:1.4.1 (*)
 |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.2 (*)
 |    |    |    +--- com.google.accompanist:accompanist-placeholder:0.31.5-beta
@@ -1060,6 +1061,15 @@ benchmarkRuntimeClasspath - Runtime classpath of /benchmark.
 |    |    |         +--- androidx.compose.material:material-icons-core:1.6.0-alpha01 (c)
 |    |    |         \--- androidx.compose.material:material-ripple:1.6.0-alpha01 (c)
 |    |    +--- androidx.compose.material3:material3:1.2.0-alpha03 (*)
+|    |    +--- androidx.compose.material3:material3-window-size-class:1.1.1 -> 1.2.0-alpha03
+|    |    |    \--- androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03
+|    |    |         +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui-unit:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.window:window:1.0.0 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |         \--- androidx.compose.material3:material3:1.2.0-alpha03 (c)
 |    |    +--- androidx.compose.runtime:runtime:1.5.0-beta03 -> 1.6.0-alpha01 (*)
 |    |    +--- androidx.compose.runtime:runtime-livedata:1.5.0-beta03 -> 1.6.0-alpha01
 |    |    |    +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)

diff --git a/apps/forlago/versions/dependencies/benchmarkUnitTestRuntimeClasspathDependencies.txt b/apps/forlago/versions/dependencies/benchmarkUnitTestRuntimeClasspathDependencies.txt
@@ -1181,7 +1181,8 @@ benchmarkUnitTestRuntimeClasspath - Runtime classpath of /benchmarkUnitTest.
 |    |    |    |         +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 |    |    |    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 |    |    |    |         +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         \--- androidx.compose.material3:material3-window-size-class:1.2.0-alpha03 (c)
 |    |    |    +--- io.github.aakira:napier:1.4.1 (*)
 |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.2 (*)
 |    |    |    +--- com.google.accompanist:accompanist-placeholder:0.31.5-beta
@@ -1207,6 +1208,15 @@ benchmarkUnitTestRuntimeClasspath - Runtime classpath of /benchmarkUnitTest.
 |    |    |         +--- androidx.compose.material:material-icons-core:1.6.0-alpha01 (c)
 |    |    |         \--- androidx.compose.material:material-ripple:1.6.0-alpha01 (c)
 |    |    +--- androidx.compose.material3:material3:1.2.0-alpha03 (*)
+|    |    +--- androidx.compose.material3:material3-window-size-class:1.1.1 -> 1.2.0-alpha03
+|    |    |    \--- androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03
+|    |    |         +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui-unit:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.window:window:1.0.0 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |         \--- androidx.compose.material3:material3:1.2.0-alpha03 (c)
 |    |    +--- androidx.compose.runtime:runtime:1.5.0-beta03 -> 1.6.0-alpha01 (*)
 |    |    +--- androidx.compose.runtime:runtime-livedata:1.5.0-beta03 -> 1.6.0-alpha01
 |    |    |    +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)

diff --git a/apps/forlago/versions/dependencies/debugRuntimeClasspathDependencies.txt b/apps/forlago/versions/dependencies/debugRuntimeClasspathDependencies.txt
@@ -1123,7 +1123,8 @@ debugRuntimeClasspath - Runtime classpath of /debug.
 |    |    |    |         +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 |    |    |    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 |    |    |    |         +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         \--- androidx.compose.material3:material3-window-size-class:1.2.0-alpha03 (c)
 |    |    |    +--- io.github.aakira:napier:1.4.1 (*)
 |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.2 (*)
 |    |    |    +--- com.google.accompanist:accompanist-placeholder:0.31.5-beta
@@ -1149,6 +1150,15 @@ debugRuntimeClasspath - Runtime classpath of /debug.
 |    |    |         +--- androidx.compose.material:material-icons-core:1.6.0-alpha01 (c)
 |    |    |         \--- androidx.compose.material:material-ripple:1.6.0-alpha01 (c)
 |    |    +--- androidx.compose.material3:material3:1.2.0-alpha03 (*)
+|    |    +--- androidx.compose.material3:material3-window-size-class:1.1.1 -> 1.2.0-alpha03
+|    |    |    \--- androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03
+|    |    |         +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui-unit:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.window:window:1.0.0 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |         \--- androidx.compose.material3:material3:1.2.0-alpha03 (c)
 |    |    +--- androidx.compose.runtime:runtime:1.5.0-beta03 -> 1.6.0-alpha01 (*)
 |    |    +--- androidx.compose.runtime:runtime-livedata:1.5.0-beta03 -> 1.6.0-alpha01
 |    |    |    +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)

diff --git a/apps/forlago/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt b/apps/forlago/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt
@@ -1270,7 +1270,8 @@ debugUnitTestRuntimeClasspath - Runtime classpath of /debugUnitTest.
 |    |    |    |         +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 |    |    |    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 |    |    |    |         +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         \--- androidx.compose.material3:material3-window-size-class:1.2.0-alpha03 (c)
 |    |    |    +--- io.github.aakira:napier:1.4.1 (*)
 |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.2 (*)
 |    |    |    +--- com.google.accompanist:accompanist-placeholder:0.31.5-beta
@@ -1296,6 +1297,15 @@ debugUnitTestRuntimeClasspath - Runtime classpath of /debugUnitTest.
 |    |    |         +--- androidx.compose.material:material-icons-core:1.6.0-alpha01 (c)
 |    |    |         \--- androidx.compose.material:material-ripple:1.6.0-alpha01 (c)
 |    |    +--- androidx.compose.material3:material3:1.2.0-alpha03 (*)
+|    |    +--- androidx.compose.material3:material3-window-size-class:1.1.1 -> 1.2.0-alpha03
+|    |    |    \--- androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03
+|    |    |         +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui-unit:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.window:window:1.0.0 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |         \--- androidx.compose.material3:material3:1.2.0-alpha03 (c)
 |    |    +--- androidx.compose.runtime:runtime:1.5.0-beta03 -> 1.6.0-alpha01 (*)
 |    |    +--- androidx.compose.runtime:runtime-livedata:1.5.0-beta03 -> 1.6.0-alpha01
 |    |    |    +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)

diff --git a/apps/forlago/versions/dependencies/releaseRuntimeClasspathDependencies.txt b/apps/forlago/versions/dependencies/releaseRuntimeClasspathDependencies.txt
@@ -1033,7 +1033,8 @@ releaseRuntimeClasspath - Runtime classpath of /release.
 |    |    |    |         +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 |    |    |    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 |    |    |    |         +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         \--- androidx.compose.material3:material3-window-size-class:1.2.0-alpha03 (c)
 |    |    |    +--- io.github.aakira:napier:1.4.1 (*)
 |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.2 (*)
 |    |    |    +--- com.google.accompanist:accompanist-placeholder:0.31.5-beta
@@ -1059,6 +1060,15 @@ releaseRuntimeClasspath - Runtime classpath of /release.
 |    |    |         +--- androidx.compose.material:material-icons-core:1.6.0-alpha01 (c)
 |    |    |         \--- androidx.compose.material:material-ripple:1.6.0-alpha01 (c)
 |    |    +--- androidx.compose.material3:material3:1.2.0-alpha03 (*)
+|    |    +--- androidx.compose.material3:material3-window-size-class:1.1.1 -> 1.2.0-alpha03
+|    |    |    \--- androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03
+|    |    |         +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui-unit:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.window:window:1.0.0 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |         \--- androidx.compose.material3:material3:1.2.0-alpha03 (c)
 |    |    +--- androidx.compose.runtime:runtime:1.5.0-beta03 -> 1.6.0-alpha01 (*)
 |    |    +--- androidx.compose.runtime:runtime-livedata:1.5.0-beta03 -> 1.6.0-alpha01
 |    |    |    +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)

diff --git a/apps/forlago/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt b/apps/forlago/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt
@@ -1181,7 +1181,8 @@ releaseUnitTestRuntimeClasspath - Runtime classpath of /releaseUnitTest.
 |    |    |    |         +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 |    |    |    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 |    |    |    |         +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |    |         \--- androidx.compose.material3:material3-window-size-class:1.2.0-alpha03 (c)
 |    |    |    +--- io.github.aakira:napier:1.4.1 (*)
 |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.2 (*)
 |    |    |    +--- com.google.accompanist:accompanist-placeholder:0.31.5-beta
@@ -1207,6 +1208,15 @@ releaseUnitTestRuntimeClasspath - Runtime classpath of /releaseUnitTest.
 |    |    |         +--- androidx.compose.material:material-icons-core:1.6.0-alpha01 (c)
 |    |    |         \--- androidx.compose.material:material-ripple:1.6.0-alpha01 (c)
 |    |    +--- androidx.compose.material3:material3:1.2.0-alpha03 (*)
+|    |    +--- androidx.compose.material3:material3-window-size-class:1.1.1 -> 1.2.0-alpha03
+|    |    |    \--- androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03
+|    |    |         +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.compose.ui:ui-unit:1.6.0-alpha01 (*)
+|    |    |         +--- androidx.window:window:1.0.0 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 (*)
+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
+|    |    |         \--- androidx.compose.material3:material3:1.2.0-alpha03 (c)
 |    |    +--- androidx.compose.runtime:runtime:1.5.0-beta03 -> 1.6.0-alpha01 (*)
 |    |    +--- androidx.compose.runtime:runtime-livedata:1.5.0-beta03 -> 1.6.0-alpha01
 |    |    |    +--- androidx.compose.runtime:runtime:1.6.0-alpha01 (*)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -41,7 +41,7 @@ accompanist-webview = { module = "com.google.accompanist:accompanist-webview", v
 android-maps-utils = "com.google.maps.android:android-maps-utils:3.4.0"
 androidx-activity-compose = "androidx.activity:activity-compose:1.7.2"
 androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
-androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha13"
+androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha16"
 androidx-biometric = "androidx.biometric:biometric:1.2.0-alpha05"
 androidx-browser = "androidx.browser:browser:1.5.0"
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }

diff --git a/...k/forlago/src/main/kotlin/com/leinardi/forlago/macrobenchmark/BaselineProfileGenerator.kt b/...k/forlago/src/main/kotlin/com/leinardi/forlago/macrobenchmark/BaselineProfileGenerator.kt
@@ -30,9 +30,9 @@ class BaselineProfileGenerator {
 
     @Test
     fun generate() {
-        rule.collectBaselineProfile(
+        rule.collect(
             packageName = BuildConfig.APPLICATION_ID.removeSuffix(".macrobenchmark"),
-            iterations = 1,
+            maxIterations = 1,
         ) {
             startApplicationJourney()
         }

diff --git a/modules/library-ui/build.gradle.kts b/modules/library-ui/build.gradle.kts
@@ -55,6 +55,7 @@ dependencies {
     api(libs.androidx.compose.material) // Still needed for stuff missing in M3, like ModalBottomSheetLayout
     api(libs.androidx.compose.material.icons.extended)
     api(libs.androidx.compose.material3)
+    api(libs.androidx.compose.material3.window.size)
     api(libs.androidx.compose.runtime)
     api(libs.androidx.compose.runtime.livedata)
     api(libs.androidx.compose.tooling)

diff --git a/modules/library-ui/src/main/kotlin/com/leinardi/forlago/library/ui/ext/WindowSizeClassExt.kt b/modules/library-ui/src/main/kotlin/com/leinardi/forlago/library/ui/ext/WindowSizeClassExt.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 Roberto Leinardi.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.leinardi.forlago.library.ui.ext
+
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+
+fun WindowSizeClass.isCompactScreen(): Boolean = widthSizeClass == WindowWidthSizeClass.Compact || heightSizeClass == WindowHeightSizeClass.Compact