Skip to content

Commit

Permalink
Merge pull request #401 from android/renovate/main-all
Browse files Browse the repository at this point in the history
Update all dependencies (main)
  • Loading branch information
mlykotom authored Jan 11, 2024
2 parents cb1c1fe + 75036fe commit 910976e
Show file tree
Hide file tree
Showing 47 changed files with 111 additions and 111 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -48,14 +48,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -47,14 +47,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -47,14 +47,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -47,14 +47,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -47,14 +47,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -48,14 +48,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -48,14 +48,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
Expand All @@ -47,14 +47,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
14 changes: 7 additions & 7 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,16 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.8.1'
implementation 'androidx.activity:activity-ktx:1.8.2'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.activity:activity-compose:1.8.1"
implementation "androidx.activity:activity-compose:1.8.2"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"

implementation 'androidx.navigation:navigation-compose:2.7.5'
implementation 'androidx.navigation:navigation-compose:2.7.6'

androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

plugins {
id 'com.diffplug.spotless' version '6.22.0'
id 'com.diffplug.spotless' version '6.23.3'
}

subprojects {
Expand Down
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions AdaptiveUICodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
implementation 'androidx.activity:activity-compose:1.8.1'
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
implementation 'androidx.activity:activity-compose:1.8.2'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.window:window:1.2.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUICodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.4"
classpath "com.android.tools.build:gradle:8.2.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}
Expand Down
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.8.1"
implementation "androidx.activity:activity-compose:1.8.2"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
Expand All @@ -122,11 +122,11 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

def lifecycle_version = "2.6.2"
def lifecycle_version = "2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.48.1"
kapt "com.google.dagger:hilt-compiler:2.48.1"
implementation "com.google.dagger:hilt-android:2.50"
kapt "com.google.dagger:hilt-compiler:2.50"

implementation "io.coil-kt:coil-compose:2.5.0"

Expand All @@ -137,7 +137,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
androidTestImplementation "com.google.dagger:hilt-android:2.48.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.48.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.48.1"
androidTestImplementation "com.google.dagger:hilt-android:2.50"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.50"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.50"
}
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.4"
classpath "com.android.tools.build:gradle:8.2.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.50"
}
}

plugins {
id 'com.diffplug.spotless' version '6.22.0'
id 'com.diffplug.spotless' version '6.23.3'
}

subprojects {
Expand Down
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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.1.4'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}
Expand Down
Loading

0 comments on commit 910976e

Please sign in to comment.