Skip to content
This repository was archived by the owner on Aug 7, 2024. It is now read-only.

Commit 2d168c7

Browse files
authored
Merge pull request #39 from ricknout/develop
Update Compose to 1.0.0-alpha09
2 parents 96bd14b + c4e9a89 commit 2d168c7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ jobs:
7777
uses: reactivecircus/android-emulator-runner@v2
7878
with:
7979
api-level: ${{ matrix.api-level }}
80-
script: ./gradlew connectedCheck
80+
# Workaround for ConnectedAndroidTest bug in AGP 7.0.0-alpha02+
81+
# https://issuetracker.google.com/issues/174839536
82+
script: ./gradlew :lib:connectedCheck
8183

8284
- name: Copy test results
8385
if: always()

buildSrc/src/main/java/com/google/android/material/composethemeadapter/dependencies.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha03"
2525

2626
const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.12.0"
2727

2828
const val mdc = "com.google.android.material:material:1.1.0"
2929

3030
object Kotlin {
31-
const val version = "1.4.20"
31+
const val version = "1.4.21"
3232
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
3333
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3434

@@ -47,7 +47,7 @@ object Libs {
4747
val snapshotUrl: String
4848
get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/ui/repository/"
4949

50-
private const val version = "1.0.0-alpha08"
50+
private const val version = "1.0.0-alpha09"
5151

5252
const val runtime = "androidx.compose.runtime:runtime:$version"
5353
const val foundation = "androidx.compose.foundation:foundation:${version}"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616

1717
distributionBase=GRADLE_USER_HOME
18-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
18+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
1919
distributionPath=wrapper/dists
2020
zipStorePath=wrapper/dists
21-
zipStoreBase=GRADLE_USER_HOME
21+
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)