Skip to content

Update all dependencies (end) #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 3, 2024
Merged

Update all dependencies (end) #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df62d9e
Update all dependencies
renovate[bot] May 1, 2024
68881b6
Update deps and fix emulator runners for instrumentation tests
simona-anomis May 2, 2024
6be2343
Update deps
simona-anomis May 2, 2024
a905824
Fix emulator failing
simona-anomis May 2, 2024
60c6fca
Fix UI tests running on CI and emulator issues
simona-anomis May 2, 2024
01c4a07
Fix UI tests running on CI and emulator issues
simona-anomis May 2, 2024
236efc4
Fix UI tests running on CI and emulator issues
simona-anomis May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- end
paths:
- 'AdvancedStateAndSideEffectsCodelab/**'
pull_request:
Expand Down Expand Up @@ -62,11 +61,11 @@ jobs:

test:
needs: build
runs-on: macos-latest # enables hardware acceleration in the virtual machine
runs-on: macos-13
timeout-minutes: 30
strategy:
matrix:
api-level: [23, 26, 29]
api-level: [26, 29]

steps:
- name: Checkout
Expand Down Expand Up @@ -106,5 +105,5 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: test-reports-${{ matrix.api-level }}
name: test-reports-state-${{ matrix.api-level }}
path: ${{ env.SAMPLE_PATH }}/app/build/reports
8 changes: 3 additions & 5 deletions .github/workflows/MigrationCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- end
paths:
- 'MigrationCodelab/**'
pull_request:
Expand Down Expand Up @@ -62,11 +61,11 @@ jobs:

test:
needs: build
runs-on: macos-latest # enables hardware acceleration in the virtual machine
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
matrix:
api-level: [23, 26, 29]
api-level: [26, 29]

steps:
- name: Checkout
Expand Down Expand Up @@ -96,7 +95,6 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ matrix.api-level }}
target: google_apis
arch: x86
disable-animations: true
script: ./gradlew connectedCheck --stacktrace
Expand All @@ -106,5 +104,5 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: test-reports-${{ matrix.api-level }}
name: test-reports-migration-${{ matrix.api-level }}
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.13'
}

packagingOptions {
Expand All @@ -73,7 +73,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -103,7 +103,7 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.activity:activity-compose:1.9.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath 'com.android.tools.build:gradle:8.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
}
}

Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions AdaptiveUiCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.13'
}
packagingOptions {
resources {
Expand All @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -79,7 +79,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.core:core-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.window:window:1.2.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
implementation "androidx.compose.material3:material3-window-size-class:1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.3.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
}
}

Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.13'
}

packagingOptions {
Expand All @@ -109,7 +109,7 @@ dependencies {
implementation "androidx.activity:activity-compose:1.9.0"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.3.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.13'
}
packagingOptions {
resources {
Expand All @@ -63,11 +63,11 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation 'androidx.core:core-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.2.1'
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.3.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.13'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
Expand All @@ -61,16 +61,16 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
androidTestImplementation(composeBom)

kapt "androidx.room:room-compiler:2.6.1"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.13.0"
implementation "androidx.fragment:fragment-ktx:1.6.2"
implementation "androidx.core:core-ktx:1.13.1"
implementation "androidx.fragment:fragment-ktx:1.7.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
Expand Down
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.3.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
}
}
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.13'
}

packagingOptions {
Expand All @@ -80,12 +80,12 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.13.0"
implementation "androidx.core:core-ktx:1.13.1"
implementation "com.google.android.material:material:1.11.0"

// Compose
Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.3.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
}
}

Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/app/build.gradle
View file
Open in desktop
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.04.01')
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
10 changes: 5 additions & 5 deletions TestingCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ buildscript {
// App dependencies
appCompatVersion = '1.6.1'
activityComposeVersion = '1.9.0'
composeCompilerVersion = '1.5.10'
composeCompilerVersion = '1.5.13'
coreTestingVersion = '2.2.0'
coroutinesVersion = "1.5.2"
espressoVersion = '3.5.1'
fragmentVersion = '1.6.2'
fragmentVersion = '1.7.0'
junitVersion = '4.13.1'
kotlinVersion = '1.9.22'
kotlinVersion = '1.9.23'
ktlintVersion = '0.48.2'
ktxVersion = '1.13.0'
ktxVersion = '1.13.1'
lifecycleVersion = '2.3.0'
materialVersion = '1.11.0'
runnerVersion = '1.0.1'
Expand All @@ -49,7 +49,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.3.2"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading