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

Update android.gradle.plugin to v8.1.0 #3002

Merged
merged 3 commits into from
Jul 25, 2023
Merged

Update android.gradle.plugin to v8.1.0 #3002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ece377b
Update android.gradle.plugin to v8.1.0
renovate[bot] Jul 25, 2023
fbd39fb
fix build-logic for new version of AGP
frett Jul 25, 2023
507f4b5
we no longer need to use a custom version of lint
frett Jul 25, 2023
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 build-logic/src/main/kotlin/AndroidConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ fun BaseExtension.configureFlavorDimensions(project: Project) {
// TODO: provide Project using the new multiple context receivers functionality.
// this is prototyped in 1.6.20 and will probably reach beta in Kotlin 1.8 or 1.9
//context(Project)
fun CommonExtension<*, *, *, *>.configureCompose(project: Project) {
fun CommonExtension<*, *, *, *, *>.configureCompose(project: Project) {
buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion =
project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
Expand All @@ -115,7 +115,7 @@ fun CommonExtension<*, *, *, *>.configureCompose(project: Project) {
// TODO: provide Project using the new multiple context receivers functionality.
// this is prototyped in 1.6.20 and will probably reach beta in Kotlin 1.8 or 1.9
//context(Project)
fun CommonExtension<*, *, *, *>.configureQaBuildType(project: Project) {
fun CommonExtension<*, *, *, *, *>.configureQaBuildType(project: Project) {
buildTypes {
register(BUILD_TYPE_QA) {
initWith(getByName(BUILD_TYPE_DEBUG))
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/GodToolsCustomUriConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.android.build.api.dsl.VariantDimension
private const val BUILD_CONFIG_FIELD_HOST = "HOST_GODTOOLS_CUSTOM_URI"
private const val PLACEHOLDER_HOST = "hostGodtoolsCustomUri"

fun CommonExtension<*, *, *, *>.configureGodToolsCustomUri() {
fun CommonExtension<*, *, *, *, *>.configureGodToolsCustomUri() {
buildFeatures.buildConfig = true
buildTypes {
named("debug") {
Expand Down
4 changes: 0 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ firebaseAppDistributionKeystorePath=firebase/app_distribution.keystore
firebaseAppDistributionKeystoreStorePassword=
firebaseAppDistributionKeystoreKeyAlias=godtools
firebaseAppDistributionKeystoreKeyPassword=

# Customise the Lint version to use a more recent version than the one bundled with AGP
# https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
android.experimental.lint.version=8.1.0-rc01
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
accompanist = "0.30.1"
android-gradle-plugin = "8.0.2"
android-gradle-plugin = "8.1.0"
androidx-compose-compiler = "1.5.0"
androidx-compose-material = "1.4.3"
androidx-compose-ui = "1.4.3"
Expand Down