Skip to content

Commit f1faf2a

Browse files
authored
Merge pull request #312 from android/renovate/all
fix(deps): update all dependencies
2 parents 9372ca5 + 8a3cacf commit f1faf2a

File tree

18 files changed

+583
-539
lines changed

18 files changed

+583
-539
lines changed

.github/workflows/firebase_test_lab.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242

4343
- name: Setup JDK
4444
id: setup-java
45-
uses: actions/setup-java@v3
45+
uses: actions/setup-java@v4
4646
with:
4747
java-version: '17'
4848
distribution: 'zulu'
4949

5050
- name: Build Macrobenchmark Sample
51-
uses: eskatos/gradle-command-action@v1
51+
uses: eskatos/gradle-command-action@v3
5252
env:
5353
JAVA_HOME: ${{ steps.setup-java.outputs.path }}
5454
with:

.github/workflows/generate-bp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646

4747
- name: Setup JDK
4848
id: setup-java
49-
uses: actions/setup-java@v3
49+
uses: actions/setup-java@v4
5050
with:
5151
java-version: 17
5252
distribution: "zulu"
5353

5454
- name: Setup Gradle
55-
uses: gradle/gradle-build-action@v2
55+
uses: gradle/gradle-build-action@v3
5656
with:
5757
gradle-home-cache-cleanup: true
5858

@@ -73,7 +73,7 @@ jobs:
7373
-Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
7474

7575
- name: Upload app with Baseline Profile
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
7878
name: "Production App"
7979
path: MacrobenchmarkSample/app/build/outputs/apk/release/*.apk

.github/workflows/macrobenchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141

4242
- name: Setup JDK
4343
id: setup-java
44-
uses: actions/setup-java@v3
44+
uses: actions/setup-java@v4
4545
with:
4646
java-version: '17'
4747
distribution: 'zulu'
4848

4949
- name: Setup Gradle
50-
uses: gradle/gradle-build-action@v2
50+
uses: gradle/gradle-build-action@v3
5151
with:
5252
gradle-home-cache-cleanup: true
5353

JankStatsSample/app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ android {
5252
jvmTarget = "11"
5353
}
5454
composeOptions {
55-
kotlinCompilerExtensionVersion = "1.3.1"
55+
kotlinCompilerExtensionVersion = "1.5.15"
5656
}
5757
namespace = "com.example.jankstats"
5858
}

JankStatsSample/gradle/libs.versions.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@
1414

1515
[versions]
1616

17-
agp = "8.6.1"
17+
agp = "8.8.1"
1818
appcompat = "1.7.0"
19-
composeBom = "2025.01.00"
20-
coroutines = "1.6.4"
21-
constraint_layout = "2.1.4"
19+
activity = "1.10.0"
20+
composeBom = "2025.02.00"
21+
coroutines = "1.10.1"
22+
constraint_layout = "2.2.0"
2223
core = "1.9.0"
2324
jankstats = "1.0.0-beta01"
24-
kotlin = "2.1.0"
25-
material = "1.7.0"
26-
navigation = "2.5.3"
27-
tracing = "1.1.0"
25+
kotlin = "2.1.10"
26+
material = "1.12.0"
27+
navigation = "2.8.7"
28+
tracing = "1.2.0"
2829

2930
[libraries]
3031

3132
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
32-
activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "appcompat" }
33+
activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
3334
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
3435
compose-activity = { group = "androidx.activity", name = "activity-compose" }
3536
compose-material = { group = "androidx.compose.material", name = "material" }
121 Bytes
Binary file not shown.

JankStatsSample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#Mon Jan 27 17:38:23 CET 2025
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
54
networkTimeout=10000
65
validateDistributionUrl=true
76
zipStoreBase=GRADLE_USER_HOME

JankStatsSample/gradlew

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

JankStatsSample/gradlew.bat

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MacrobenchmarkSample/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ plugins {
2222
}
2323

2424
android {
25-
compileSdk = 34
25+
compileSdk = 35
2626
namespace = "com.example.macrobenchmark.target"
2727

2828
defaultConfig {
2929
applicationId = "com.example.macrobenchmark.target"
3030
versionCode = 1
3131
versionName = "1.0"
3232
minSdk = 24
33-
targetSdk = 34
33+
targetSdk = 35
3434
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3535
}
3636

0 commit comments

Comments
 (0)