Skip to content

Commit 7ab3eee

Browse files
authored
Merge pull request #416 from android/renovate/end-all
Update all dependencies (end)
2 parents 4106f68 + f8d9902 commit 7ab3eee

File tree

35 files changed

+106
-106
lines changed

35 files changed

+106
-106
lines changed

.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,5 @@ jobs:
106106
if: always()
107107
uses: actions/upload-artifact@v4
108108
with:
109-
name: test-reports
109+
name: test-reports-${{ matrix.api-level }}
110110
path: ${{ env.SAMPLE_PATH }}/app/build/reports

.github/workflows/MigrationCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,5 @@ jobs:
106106
if: always()
107107
uses: actions/upload-artifact@v4
108108
with:
109-
name: test-reports
109+
name: test-reports-${{ matrix.api-level }}
110110
path: ${{ env.SAMPLE_PATH }}/app/build/reports

AccessibilityCodelab/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ android {
7373
}
7474

7575
dependencies {
76-
def composeBom = platform('androidx.compose:compose-bom:2024.01.00')
76+
def composeBom = platform('androidx.compose:compose-bom:2024.02.00')
7777
implementation(composeBom)
7878
testImplementation(composeBom)
7979
androidTestImplementation(composeBom)
@@ -111,7 +111,7 @@ dependencies {
111111
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
112112
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
113113

114-
implementation 'androidx.navigation:navigation-compose:2.7.6'
114+
implementation 'androidx.navigation:navigation-compose:2.7.7'
115115

116116
androidTestImplementation 'androidx.test:rules:1.5.0'
117117
androidTestImplementation 'androidx.test:runner:1.5.2'
-19.8 KB
Binary file not shown.

AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

AccessibilityCodelab/gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

AdaptiveUiCodelab/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ android {
6565
dependencies {
6666

6767

68-
def composeBom = platform('androidx.compose:compose-bom:2024.01.00')
68+
def composeBom = platform('androidx.compose:compose-bom:2024.02.00')
6969
implementation(composeBom)
7070
androidTestImplementation(composeBom)
7171

@@ -82,7 +82,7 @@ dependencies {
8282
implementation 'androidx.core:core-ktx:1.12.0'
8383
implementation "androidx.window:window:1.2.0"
8484
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
85-
implementation "androidx.compose.material3:material3-window-size-class:1.2.0-rc01"
85+
implementation "androidx.compose.material3:material3-window-size-class:1.2.0"
8686

8787
testImplementation 'junit:junit:4.13.2'
8888
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-19.8 KB
Binary file not shown.

AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

AdaptiveUiCodelab/gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

0 commit comments

Comments
 (0)