Skip to content

[Crane] Update to AGP13, keeping Compose alpha03 #214

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

Merged
merged 2 commits into from
Oct 2, 2020
Merged

[Crane] Update to AGP13, keeping Compose alpha03 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3f74e4
[Crane] Update to AGP13, keeping Compose alpha03
JoseAlcerreca Oct 2, 2020
fbb28bf
Merge branch 'dev_alpha04' into dev_crane_alpha04
JoseAlcerreca Oct 2, 2020
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
16 changes: 15 additions & 1 deletion Crane/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,18 @@ subprojects {
freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
}
}
}

// Crane uses Compose alpha03 and Android Gradle Plugin 4.2.0-alpha13 which are incompatible
// TODO: Remove this workaround when updating to >alpha04
configurations.configureEach {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
def group = details.requested.group
def module = details.requested.module.name
def version = details.requested.version

if (group == 'androidx.compose.compiler' && module == 'compiler') {
details.useTarget("androidx.compose:compose-compiler:$version")
}
}
}
}
2 changes: 1 addition & 1 deletion Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"

Expand Down