Skip to content

Commit

Permalink
Merge pull request #474 from android/renovate/main-all
Browse files Browse the repository at this point in the history
Update all dependencies (main)
  • Loading branch information
bentrengrove authored Sep 5, 2024
2 parents 20410d8 + 1e54aad commit 60e06cd
Show file tree
Hide file tree
Showing 91 changed files with 504 additions and 371 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
24 changes: 12 additions & 12 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
def composeBom = platform('androidx.compose:compose-bom:2024.09.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -107,30 +107,30 @@ dependencies {
androidTestImplementation "androidx.compose.ui:ui-test"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"

def accompanist_version = '0.34.0'
def accompanist_version = '0.36.0'
implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.9.0'
implementation 'androidx.activity:activity-ktx:1.9.2'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.activity:activity-compose:1.9.0"
implementation "androidx.activity:activity-compose:1.9.2"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.5"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.5"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5"

implementation 'androidx.navigation:navigation-compose:2.7.7'
implementation 'androidx.navigation:navigation-compose:2.8.0'

androidTestImplementation 'androidx.test:rules:1.6.0'
androidTestImplementation 'androidx.test:runner:1.6.0'
androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'

// TODO: Bump to latest after Espresso 3.5.0 goes stable
// (due to https://github.com/robolectric/robolectric/issues/6593)
testImplementation 'org.robolectric:robolectric:4.12.2'
testImplementation 'org.robolectric:robolectric:4.13'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.5.0'
classpath 'com.android.tools.build:gradle:8.6.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
}
}
Expand Down
Binary file modified AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions AccessibilityCodelab/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions AccessibilityCodelab/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
12 changes: 6 additions & 6 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
androidGradlePlugin = "8.5.0"
composeBom = "2024.06.00"
androidGradlePlugin = "8.6.0"
composeBom = "2024.09.00"
coreKtx = "1.13.1"
activityCompose = "1.9.0"
espressoCore = "3.6.0"
activityCompose = "1.9.2"
espressoCore = "3.6.1"
junit = "4.13.2"
junitVersion = "1.2.0"
junitVersion = "1.2.1"
kotlin = "2.0.20"
kotlinxCoroutinesAndroid = "1.8.1"
lifecycle = "2.8.2"
lifecycle = "2.8.5"
window = "1.3.0"

[libraries]
Expand Down
Binary file modified AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions AdaptiveUiCodelab/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions AdaptiveUiCodelab/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
28 changes: 14 additions & 14 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.9.0"
implementation "androidx.activity:activity-compose:1.9.2"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.tracing:tracing:1.2.0"

def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
def composeBom = platform('androidx.compose:compose-bom:2024.09.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -120,22 +120,22 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

def lifecycle_version = "2.8.2"
def lifecycle_version = "2.8.5"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.51.1"
kapt "com.google.dagger:hilt-compiler:2.51.1"
implementation "com.google.dagger:hilt-android:2.52"
kapt "com.google.dagger:hilt-compiler:2.52"

implementation "io.coil-kt:coil-compose:2.6.0"
implementation "io.coil-kt:coil-compose:2.7.0"

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.6.0"
androidTestImplementation "androidx.test:runner:1.6.0"
androidTestImplementation "androidx.test:rules:1.6.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.0"
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.0"
androidTestImplementation "androidx.test:core:1.6.1"
androidTestImplementation "androidx.test:runner:1.6.2"
androidTestImplementation "androidx.test:rules:1.6.1"
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1"
androidTestImplementation "com.google.dagger:hilt-android:2.52"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.52"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.52"
}
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.5.0"
classpath "com.android.tools.build:gradle:8.6.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
}
}
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions AdvancedStateAndSideEffectsCodelab/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.0'
classpath 'com.android.tools.build:gradle:8.6.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
}
Expand Down
Loading

0 comments on commit 60e06cd

Please sign in to comment.