Skip to content
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

Jump to bottom

Update all dependencies (main) #362

Merged
merged 2 commits into from
Jul 25, 2023
Merged

Update all dependencies (main) #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b82941
Update all dependencies
renovate[bot] Jun 7, 2023
391f2e1
Merge branch 'main' into renovate/main-all
mlykotom Jul 25, 2023
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
10 changes: 5 additions & 5 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -118,23 +118,23 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.7.1'
implementation 'androidx.activity:activity-ktx:1.7.2'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.activity:activity-compose:1.7.2"

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

implementation 'androidx.navigation:navigation-compose:2.5.3'
implementation 'androidx.navigation:navigation-compose:2.6.0'

androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.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.10.2'
testImplementation 'org.robolectric:robolectric:4.10.3'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
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,13 +21,13 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

plugins {
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
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 @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -78,9 +78,9 @@ dependencies {

implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.window:window:1.0.0"
implementation "androidx.window:window:1.1.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"

testImplementation 'junit:junit:4.13.2'
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 @@ -14,8 +14,8 @@
* limitations under the License.
*/
plugins {
id 'com.android.application' version "8.0.1" apply false
id 'com.android.library' version "8.0.1" apply false
id 'com.android.application' version "8.0.2" apply false
id 'com.android.library' version "8.0.2" apply false
id 'org.jetbrains.kotlin.android' version "1.8.22" apply false
}

Expand Down
16 changes: 8 additions & 8 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.activity:activity-compose:1.7.2"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -126,10 +126,10 @@ dependencies {
def lifecycle_version = "2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.46"
kapt "com.google.dagger:hilt-compiler:2.46"
implementation "com.google.dagger:hilt-android:2.46.1"
kapt "com.google.dagger:hilt-compiler:2.46.1"

implementation "io.coil-kt:coil-compose:2.3.0"
implementation "io.coil-kt:coil-compose:2.4.0"

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.5.0"
Expand All @@ -138,7 +138,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.1"
androidTestImplementation "com.google.dagger:hilt-android:2.46"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.46"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.46"
androidTestImplementation "com.google.dagger:hilt-android:2.46.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.46.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.46.1"
}
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
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.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.46"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1"
}
}

plugins {
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
View file
Open in desktop
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.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}
Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/finished/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/start/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/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 {
}

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

Expand All @@ -74,7 +74,7 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.9.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.activity:activity-compose:1.7.2'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ buildscript {
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation 'androidx.core:core-ktx:1.10.1'
Expand All @@ -70,5 +70,5 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
debugImplementation "androidx.compose.ui:ui-tooling"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.activity:activity-compose:1.7.2'
}
6 changes: 3 additions & 3 deletions BasicStateCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/
plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation 'androidx.compose.material3:material3'
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
}
10 changes: 5 additions & 5 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ android {
}

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

Expand All @@ -70,11 +70,11 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.fragment:fragment-ktx:1.5.7"
implementation "androidx.fragment:fragment-ktx:1.6.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
implementation "androidx.navigation:navigation-fragment-ktx:2.5.3"
implementation "androidx.navigation:navigation-ui-ktx:2.5.3"
implementation "androidx.navigation:navigation-fragment-ktx:2.6.0"
implementation "androidx.navigation:navigation-ui-ktx:2.6.0"
implementation "androidx.recyclerview:recyclerview:1.3.0"
implementation "androidx.room:room-runtime:2.5.1"
implementation "androidx.room:room-ktx:2.5.1"
Expand Down Expand Up @@ -108,7 +108,7 @@ dependencies {
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
androidTestImplementation "androidx.work:work-testing:2.8.1"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.0.0"
androidTestImplementation "com.google.truth:truth:1.1.3"
androidTestImplementation "com.google.truth:truth:1.1.4"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
testImplementation "junit:junit:4.13.2"
}
6 changes: 3 additions & 3 deletions MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
}
}

plugins {
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

allprojects {
Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

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

Expand All @@ -94,7 +94,7 @@ dependencies {
implementation "androidx.compose.foundation:foundation"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.activity:activity-compose:1.7.2"
debugImplementation "androidx.compose.ui:ui-tooling"

// Testing dependencies
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,13 +21,13 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

plugins {
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
Expand Down
6 changes: 3 additions & 3 deletions TestingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.10.1"
implementation "com.google.android.material:material:1.9.0"
implementation "androidx.fragment:fragment-ktx:1.5.7"
implementation "androidx.fragment:fragment-ktx:1.6.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"

// Compose
Expand All @@ -107,7 +107,7 @@ dependencies {
implementation "androidx.compose.runtime:runtime-livedata"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.activity:activity-compose:1.7.2"
debugImplementation "androidx.compose.ui:ui-tooling"

// Testing dependencies
Expand Down
4 changes: 2 additions & 2 deletions TestingCodelab/build.gradle
View file
Open in desktop
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.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

plugins {
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
Expand Down
Loading
Loading