msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 22:17:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "feat(build): upgrade to AGP 8.1.0-beta01"

Browse source 
Newer AGP releases cause incorrect desugaring of the Crux dependency

This reverts commit 68a20e0d11.
This commit is contained in:
Harsh Shandilya 2023-04-26 14:37:03 +00:00
parent 6f55da754c
commit 0cd4257e73
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt
View file

@ -11,7 +11,6 @@ package dev.msfjarvis.claw.gradle
import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.LibraryExtension import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.android.build.api.variant.HasUnitTestBuilder
import com.android.build.api.variant.LibraryAndroidComponentsExtension import com.android.build.api.variant.LibraryAndroidComponentsExtension
import com.android.build.gradle.BaseExtension import com.android.build.gradle.BaseExtension
import dev.msfjarvis.claw.gradle.LintConfig.configureLint import dev.msfjarvis.claw.gradle.LintConfig.configureLint
@ -74,7 +73,7 @@ private fun Project.configureSlimTests() {
// Disable unit test tasks on the release build type for Android Library projects // Disable unit test tasks on the release build type for Android Library projects
extensions.findByType<LibraryAndroidComponentsExtension>()?.run { extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
beforeVariants(selector().withBuildType("release")) { beforeVariants(selector().withBuildType("release")) {
(it as HasUnitTestBuilder).enableUnitTest = false it.enableUnitTest = false
it.enableAndroidTest = false it.enableAndroidTest = false
} }
} }
@ -82,7 +81,7 @@ private fun Project.configureSlimTests() {
// Disable unit test tasks on the release build type for Android Application projects. // Disable unit test tasks on the release build type for Android Application projects.
extensions.findByType<ApplicationAndroidComponentsExtension>()?.run { extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
beforeVariants(selector().withBuildType("release")) { beforeVariants(selector().withBuildType("release")) {
(it as HasUnitTestBuilder).enableUnitTest = false it.enableUnitTest = false
it.enableAndroidTest = false it.enableAndroidTest = false
} }
} }

4
common/build.gradle.kts
View file

@ -6,8 +6,6 @@
*/ */
@file:Suppress("UnstableApiUsage") @file:Suppress("UnstableApiUsage")
import com.android.build.api.variant.HasUnitTestBuilder
plugins { plugins {
id("dev.msfjarvis.claw.android-library") id("dev.msfjarvis.claw.android-library")
id("dev.msfjarvis.claw.kotlin-android") id("dev.msfjarvis.claw.kotlin-android")
@ -27,7 +25,7 @@ android {
namespace = "dev.msfjarvis.claw.common" namespace = "dev.msfjarvis.claw.common"
} }
androidComponents { beforeVariants { (it as HasUnitTestBuilder).enableUnitTest = false } } androidComponents { beforeVariants { it.enableUnitTest = false } }
anvil { generateDaggerFactories.set(true) } anvil { generateDaggerFactories.set(true) }

2
gradle/libs.versions.toml
View file

@ -1,6 +1,6 @@
[versions] [versions]
accompanist = "0.30.1" accompanist = "0.30.1"
agp = "8.1.0-beta01" agp = "8.0.0"
coil = "2.3.0" coil = "2.3.0"
# @keep used for kotlinCompilerExtensionVersion # @keep used for kotlinCompilerExtensionVersion
composeCompiler = "1.4.4" composeCompiler = "1.4.4"