Merge branch 'android:main' into Kotlin-2.0

android · Sep 10, 2024 · 37dbddc · 37dbddc
2 parents 5b7b9d0 + eb0ed27
commit 37dbddc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -26,17 +26,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: '17'
 
       - name: Generate cache key
         run: .github/scripts/checksum.sh checksum.txt
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches/modules-*
@@ -53,7 +54,6 @@ jobs:
         run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: assemble
           path: assemble.zip
diff --git a/CanonicalLayouts/list-detail-compose/app/build.gradle b/CanonicalLayouts/list-detail-compose/app/build.gradle
@@ -66,22 +66,22 @@ composeCompiler {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.08.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.00')
     implementation(composeBom)
 
     implementation "com.google.accompanist:accompanist-adaptive:0.32.0"
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5'
     implementation 'androidx.activity:activity-compose:1.9.2'
-    implementation "androidx.compose.foundation:foundation:1.6.8"
-    implementation "androidx.compose.ui:ui:1.6.8"
+    implementation "androidx.compose.foundation:foundation:1.7.0"
+    implementation "androidx.compose.ui:ui:1.7.0"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.window:window:1.3.0"
-    implementation 'androidx.compose.material3:material3:1.3.0-rc01'
-    implementation 'androidx.compose.material3.adaptive:adaptive:1.1.0-alpha01'
-    implementation 'androidx.compose.material3.adaptive:adaptive-layout:1.1.0-alpha01'
-    implementation 'androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-alpha01'
-    implementation "androidx.compose.material3:material3-window-size-class:1.3.0-rc01"
-    implementation "androidx.compose.animation:animation:1.7.0-rc01"
+    implementation 'androidx.compose.material3:material3:1.3.0'
+    implementation 'androidx.compose.material3.adaptive:adaptive:1.1.0-alpha02'
+    implementation 'androidx.compose.material3.adaptive:adaptive-layout:1.1.0-alpha02'
+    implementation 'androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-alpha02'
+    implementation "androidx.compose.material3:material3-window-size-class:1.3.0"
+    implementation "androidx.compose.animation:animation:1.7.0"
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/...ist-detail-compose/app/src/main/java/com/example/listdetailcompose/ui/ListDetailSample.kt b/...ist-detail-compose/app/src/main/java/com/example/listdetailcompose/ui/ListDetailSample.kt
@@ -97,7 +97,7 @@ fun ListDetailSample() {
     var selectedWordIndex: Int? by rememberSaveable { mutableStateOf(null) }
     val navigator = rememberListDetailPaneScaffoldNavigator<Nothing>()
     val isListAndDetailVisible =
-        currentWindowAdaptiveInfo().windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.EXPANDED
+        navigator.scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded && navigator.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
 
     BackHandler(enabled = navigator.canNavigateBack()) {
         navigator.navigateBack()

diff --git a/CanonicalLayouts/supporting-pane-compose/app/build.gradle b/CanonicalLayouts/supporting-pane-compose/app/build.gradle
@@ -68,19 +68,19 @@ composeCompiler {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.08.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.00')
     implementation(composeBom)
 
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
-    implementation 'androidx.activity:activity-compose:1.9.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5'
+    implementation 'androidx.activity:activity-compose:1.9.2'
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.window:window:1.3.0"
-    implementation 'androidx.compose.material3:material3:1.3.0-rc01'
-    implementation 'androidx.compose.material3.adaptive:adaptive:1.1.0-alpha01'
-    implementation 'androidx.compose.material3.adaptive:adaptive-layout:1.1.0-alpha01'
-    implementation 'androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-alpha01'
-    implementation "androidx.compose.material3:material3-window-size-class:1.3.0-rc01"
+    implementation 'androidx.compose.material3:material3:1.3.0'
+    implementation 'androidx.compose.material3.adaptive:adaptive:1.1.0-alpha02'
+    implementation 'androidx.compose.material3.adaptive:adaptive-layout:1.1.0-alpha02'
+    implementation 'androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-alpha02'
+    implementation "androidx.compose.material3:material3-window-size-class:1.3.0"
     testImplementation 'junit:junit:4.13.2'
 }