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

Update all dependencies #522

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Update all dependencies #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e39659
Update all dependencies
renovate[bot] Dec 3, 2024
7e0f864
Bumps Android SDKs to 21->35
JoseAlcerreca Dec 3, 2024
cb43677
New location for screenshot reference images
JoseAlcerreca Dec 3, 2024
edbc8b7
Adds correct versioning for guava
JoseAlcerreca Dec 9, 2024
e210eea
Removes unused rulesVersion from gradle file
JoseAlcerreca Dec 9, 2024
ed91d33
Guava version jre back to android, now that Renovate understands the …
JoseAlcerreca Dec 9, 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
4 changes: 2 additions & 2 deletions .github/workflows/composescreenshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set Up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copy-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it,
# but specifies master branch (old default).
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle-wrapper-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
name: Validation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v3
20 changes: 10 additions & 10 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,22 @@ maven_install(
maven.artifact(
"com.google.inject",
"guice",
"4.0",
"7.0.0",
neverlink = True,
),
"junit:junit:4.12",
"junit:junit:4.13.2",
"javax.inject:javax.inject:1",
"org.hamcrest:java-hamcrest:2.0.0.0",
maven.artifact(
"org.robolectric",
"robolectric",
"4.3-beta-1",
"4.14.1",
neverlink = True,
exclusions = ["com.google.guava:guava"],
),
"com.google.guava:guava:26.0-android",
"com.google.truth:truth:0.42",
"com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0",
"com.google.guava:guava:33.3.1-jre",
"com.google.truth:truth:1.4.4",
"com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1",
],
jetify = True,
repositories = [
Expand All @@ -102,11 +102,11 @@ maven_install(

http_archive(
name = "bazel_toolchains",
sha256 = "4d348abfaddbcee0c077fc51bb1177065c3663191588ab3d958f027cbfe1818b",
strip_prefix = "bazel-toolchains-2.1.0",
sha256 = "ef30f61a17ac7f11a121e90818f85faa7ad27a99b6665bd59201afe17eca5182",
strip_prefix = "bazel-toolchains-5124557",
urls = [
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.1.0/bazel-toolchains-2.1.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/5124557/bazel-toolchains-5124557.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/5124557.tar.gz",
],
)

Expand Down
4 changes: 2 additions & 2 deletions integration/ServiceTestRuleSample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 34
compileSdk 35
defaultConfig {
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
minSdkVersion 21
targetSdkVersion 34
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand Down
4 changes: 2 additions & 2 deletions integration/ServiceTestRuleSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = "8.5.0"
ext.agpVersion = "8.7.3"
repositories {
// Insert local test repo here
google()
Expand All @@ -26,6 +26,6 @@ allprojects {
ext {
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
runnerVersion = "1.6.2"
rulesVersion = "1.6.1"
}
2 changes: 1 addition & 1 deletion integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>android/.github:renovate-config"
],
"packageRules": [
{
"matchPackageNames": ["com.google.guava:guava"],
"versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-(?<compatibility>.*))?$"
}
]
}
4 changes: 2 additions & 2 deletions runner/AndroidJunitRunnerSample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apply plugin: "com.android.application"


android {
compileSdk 34
compileSdk 35
defaultConfig {
applicationId "com.example.android.testing.androidjunitrunnersample"
minSdkVersion 21
targetSdkVersion 34
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand Down
10 changes: 5 additions & 5 deletions runner/AndroidJunitRunnerSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = "8.5.0"
ext.agpVersion = "8.7.3"
repositories {
// Insert local test repo here
google()
Expand All @@ -25,12 +25,12 @@ allprojects {

ext {
buildToolsVersion = "32.0.0"
androidxAnnotationVersion = "1.5.0"
guavaVersion = "31.1-android"
androidxAnnotationVersion = "1.9.1"
guavaVersion = "33.3.1-jre"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this use the android variant?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. This is the problem with creative version names. J > A.

Turns out Renovate supports "compatibility" so I created the versioning in the config.

coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
runnerVersion = "1.6.2"
rulesVersion = "1.6.1"
espressoVersion = "3.6.1"
truthVersion = "1.1.3"
truthVersion = "1.4.4"
}
2 changes: 1 addition & 1 deletion runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions runner/AndroidTestOrchestratorSample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 34
compileSdk 35
defaultConfig {
applicationId "com.example.android.testing.androidtestorchestratorsample"
minSdkVersion 21
targetSdkVersion 34
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand Down
14 changes: 7 additions & 7 deletions runner/AndroidTestOrchestratorSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = "8.5.0"
ext.agpVersion = "8.7.3"
repositories {
// Insert local test repo here
google()
Expand All @@ -24,14 +24,14 @@ allprojects {
}

ext {
androidxAnnotationVersion = "1.5.0"
guavaVersion = "31.1-android"
androidxAnnotationVersion = "1.9.1"
guavaVersion = "33.3.1-jre"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
monitorVersion = "1.7.1"
runnerVersion = "1.6.2"
monitorVersion = "1.7.2"
rulesVersion = "1.6.1"
espressoVersion = "3.6.1"
orchestratorVersion = "1.5.0"
truthVersion = "1.1.3"
orchestratorVersion = "1.5.1"
truthVersion = "1.4.4"
}
2 changes: 1 addition & 1 deletion runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 33
compileSdk 35
defaultConfig {
applicationId "com.example.android.testing.androidtestorchestratorsample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand Down
21 changes: 10 additions & 11 deletions runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.agpVersion = "8.1.1"
ext.agpVersion = "8.7.3"
repositories {
// Insert local test repo here
google()
Expand All @@ -24,14 +24,13 @@ allprojects {
}

ext {
androidxAnnotationVersion = "1.2.0"
guavaVersion = "30.1.1-android"
coreVersion = "1.6.0-alpha01"
extJUnitVersion = "1.2.0-alpha01"
runnerVersion = "1.6.0-alpha03"
rulesVersion = "1.6.0-alpha01"
testServicesVersion = "1.5.0-alpha01"
orchestratorVersion = "1.5.0-alpha01"
espressoVersion = "3.6.0-alpha01"
truthVersion = "1.1.3"
androidxAnnotationVersion = "1.9.1"
guavaVersion = "33.3.1-android"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.2"
testServicesVersion = "1.5.0"
orchestratorVersion = "1.5.1"
espressoVersion = "3.6.1"
truthVersion = "1.4.4"
}
2 changes: 1 addition & 1 deletion ...er/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jun 01 11:09:45 PDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions ui/PreviewScreenshot/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ plugins {

android {
namespace = "com.example.compose.previewscreenshot"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.example.compose.previewscreenshot"
minSdk = 24
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1.0"

Expand Down
Binary file removed ...le.compose.previewscreenshot.MainScreen.GreetingPreview_1300b7bc_da39a3ee_0.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...le.compose.previewscreenshot.MainScreen.GreetingPreview_3d8b4969_da39a3ee_0.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...le.compose.previewscreenshot.MainScreen.GreetingPreview_faf0477b_da39a3ee_0.png
View file
Open in desktop
Binary file not shown.
Binary file added ...com/example/compose/previewscreenshot/MainScreen/GreetingPreview_302f22d1_0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...com/example/compose/previewscreenshot/MainScreen/GreetingPreview_4d30ee2f_0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...com/example/compose/previewscreenshot/MainScreen/GreetingPreview_748aa731_0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions ui/PreviewScreenshot/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
agp = "8.5.0-beta01"
agp = "8.7.3"
kotlin = "1.9.23"
coreKtx = "1.13.1"
coreKtx = "1.15.0"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
lifecycleRuntimeKtx = "2.7.0"
activityCompose = "1.9.0"
composeBom = "2024.05.00"
screenshot = "0.0.1-alpha01"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
lifecycleRuntimeKtx = "2.8.7"
activityCompose = "1.9.3"
composeBom = "2024.11.00"
screenshot = "0.0.1-alpha08"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand Down
2 changes: 1 addition & 1 deletion ui/PreviewScreenshot/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
#Tue May 14 09:02:08 UTC 2024
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.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions ui/espresso/AccessibilitySample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk 34
compileSdk 35
defaultConfig {
applicationId "com.example.android.testing.espresso.AccessibilitySample"
minSdkVersion 21
targetSdkVersion 34
targetSdkVersion 35
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -66,5 +66,5 @@ dependencies {
// workaround for https://github.com/android/android-test/issues/861
exclude group: "org.checkerframework", module: "checker"
}
androidTestImplementation "com.google.truth:truth:1.1.3"
androidTestImplementation "com.google.truth:truth:1.4.4"
}
8 changes: 4 additions & 4 deletions ui/espresso/AccessibilitySample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext.kotlinVersion = "1.9.22"
ext.agpVersion = "8.5.0"
ext.agpVersion = "8.7.3"
repositories {
// Insert local test repo here
google()
Expand All @@ -26,12 +26,12 @@ allprojects {
}

ext {
androidxAnnotationVersion = "1.5.0"
androidxAnnotationVersion = "1.9.1"
robolectricVersion = "4.13"
extTruthVersion = "1.6.0"
coreVersion = "1.6.1"
extJUnitVersion = "1.2.1"
runnerVersion = "1.6.1"
runnerVersion = "1.6.2"
espressoVersion = "3.6.1"
guavaVersion = "31.1-android"
guavaVersion = "33.3.1-jre"
}
2 changes: 1 addition & 1 deletion ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading