Skip to content

Commit

Permalink
Update all dependencies (main) (android#357)
Browse files Browse the repository at this point in the history
* Update all dependencies

* Revert compiler deps update

* Add namespace for Theming codelab

* Update kotlin deps for Theming

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Simona Stojanovic <anomis@google.com>
  • Loading branch information
renovate[bot] and simona-anomis authored May 11, 2023
1 parent deb6c41 commit 98d443a
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 47 deletions.
6 changes: 3 additions & 3 deletions AccessibilityCodelab/app/build.gradle
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.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -119,7 +119,7 @@ dependencies {

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

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
Expand All @@ -134,7 +134,7 @@ dependencies {

// 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'
testImplementation 'org.robolectric:robolectric:4.10.2'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUICodelab/app/build.gradle
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.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -79,7 +79,7 @@ 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.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.window:window:1.0.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"

Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ dependencies {
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ android {
}

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

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

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

implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.8.0"
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'
testImplementation 'junit:junit:4.13.2'
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.10.0'
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.compose.ui:ui"
Expand Down
6 changes: 3 additions & 3 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ android {
}

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

kapt "androidx.room:room-compiler:2.5.1"
kapt "com.github.bumptech.glide:compiler:4.15.1"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.10.0"
implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.fragment:fragment-ktx:1.5.7"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
Expand All @@ -81,7 +81,7 @@ dependencies {
implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation "androidx.work:work-runtime-ktx:2.8.1"
implementation "com.github.bumptech.glide:glide:4.15.1"
implementation "com.google.android.material:material:1.8.0"
implementation "com.google.android.material:material:1.9.0"
implementation "com.google.code.gson:gson:2.10.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
Expand Down
6 changes: 3 additions & 3 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.10.0"
implementation "com.google.android.material:material:1.8.0"
implementation "androidx.core:core-ktx:1.10.1"
implementation "com.google.android.material:material:1.9.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
6 changes: 3 additions & 3 deletions TestingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.10.0"
implementation "com.google.android.material:material:1.8.0"
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 "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"

Expand Down
21 changes: 11 additions & 10 deletions ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.example.reply"
compileSdkVersion 33
defaultConfig {
applicationId 'com.example.reply'
Expand Down Expand Up @@ -79,7 +80,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.3.2'
kotlinCompilerExtensionVersion '1.4.6'
}

packagingOptions {
Expand All @@ -89,7 +90,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.01.00')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -111,15 +112,15 @@ dependencies {

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

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

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
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"

androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
Expand Down
6 changes: 3 additions & 3 deletions ThemingCodelab/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:7.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
classpath 'com.android.tools.build:gradle:8.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
}
}

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

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelabM2/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
Expand Down
Binary file modified ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion ThemingCodelabM2/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-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 6 additions & 5 deletions ThemingCodelabM2/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down

0 comments on commit 98d443a

Please sign in to comment.