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

Updates to Compose 1.2.0-alpha01 #952

Merged
merged 13 commits into from
Jan 19, 2022
Merged

Updates to Compose 1.2.0-alpha01 #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f6fe41a
Updates to Compose 1.2.0-alpha01
JoseAlcerreca Jan 13, 2022
c99321a
Bumps versions and fixes lint issue
JoseAlcerreca Jan 13, 2022
1744821
Uninstall apps after tests to avoid running out of storage in API 22
JoseAlcerreca Jan 14, 2022
2028795
Remove emulator build
Jan 17, 2022
bfc1361
Bump up emulator runner version
Jan 18, 2022
fc08f31
Increase shards
Jan 18, 2022
52d9db7
Use google_apis for API 22 emulator
Jan 18, 2022
40bfa4f
Fix sh expression
Jan 18, 2022
0ad1494
Uninstall apps before running tests
Jan 18, 2022
d068cf5
Runs gradle command per module
Jan 18, 2022
1c60040
Check for Android module
Jan 18, 2022
b24db84
Remove affected modules
Jan 18, 2022
de2e1ac
Uninstall test apps after running UI tests
Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build-snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ jobs:
api-level: ${{ matrix.api-level }}
target: ${{ steps.determine-target.outputs.TARGET }}
profile: Galaxy Nexus
emulator-build: 7425822 # https://github.com/ReactiveCircus/android-emulator-runner/issues/160
# We run all affected tests of the PR (or commit)
script: ./scripts/run-tests.sh --log-file=logcat.txt --run-affected --affected-base-ref=$BASE_REF --shard-index=${{ matrix.shard }} --shard-count=2

- name: Clean secrets
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ jobs:
api-level: ${{ matrix.api-level }}
target: ${{ steps.determine-target.outputs.TARGET }}
profile: Galaxy Nexus
emulator-build: 7425822 # https://github.com/ReactiveCircus/android-emulator-runner/issues/160
# We run all affected tests of the PR (or commit)
script: ./scripts/run-tests.sh --log-file=logcat.txt --run-affected --affected-base-ref=$BASE_REF --shard-index=${{ matrix.shard }} --shard-count=2

- name: Clean secrets
Expand Down
2 changes: 1 addition & 1 deletion appcompat-theme/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
8 changes: 8 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ subprojects {
}
}

// Remove all test apps after running UI tests.
// This is specially important in CI so that test emulators don't run out of space.
tasks.whenTaskAdded { task ->
if (task.name == 'connectedDebugAndroidTest') {
task.finalizedBy 'uninstallDebugAndroidTest'
}
}

configurations.configureEach {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
// Make sure that we're using the Android version of Guava
Expand Down
2 changes: 1 addition & 1 deletion drawablepainter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion flowlayout/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000

GROUP=com.google.accompanist
# !! No longer need to update this manually when using a Compose SNAPSHOT
VERSION_NAME=0.22.1-SNAPSHOT
VERSION_NAME=0.24.0-alpha

POM_DESCRIPTION=Utilities for Jetpack Compose

Expand Down
7 changes: 3 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[versions]
compose = "1.1.0-rc01"
compose = "1.2.0-alpha01"
composesnapshot = "-" # a single character = no snapshot
composeCompiler = "1.1.0-rc02"

# gradlePlugin and lint need to be updated together
gradlePlugin = "7.0.4"
gradlePlugin = "7.1.0-rc01"
lint = "30.0.3"

ktlint = "0.42.1"
Expand Down Expand Up @@ -54,7 +53,7 @@ coil-coil = { module = "io.coil-kt:coil", version.ref = "coil" }
coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }

androidx-appcompat = "androidx.appcompat:appcompat:1.4.0"
androidx-appcompat = "androidx.appcompat:appcompat:1.4.1"
androidx-core = "androidx.core:core-ktx:1.7.0"
androidx-activity-compose = "androidx.activity:activity-compose:1.4.0"
androidx-fragment = "androidx.fragment:fragment-ktx:1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion 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-7.3.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion insets-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion insets/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion internal-testutils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion navigation-animation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion navigation-material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion pager-indicators/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion pager/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion permissions/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion placeholder-material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion placeholder/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
kotlinCompilerExtensionVersion libs.versions.compose.get()
}
}

Expand Down