fix: use Android flavors when appropriate. #1512
Merged
+269
−93
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
autonomousapps
commented
Aug 10, 2025
| @JvmStatic val AGP_MAX = version("8.12.0") | ||
| @JvmStatic val AGP_MAX = version("8.13.0") |
There was a problem hiding this comment.
Unrelated, minimize annoying warning.
autonomousapps
commented
Aug 10, 2025
Comment on lines
458
to
463
| return if (withFlavor) { | ||
| // debug + test => debugTest | ||
| "$name${kindName.capitalizeSafely()}" | ||
| } else { | ||
| kindName | ||
| } |
autonomousapps
commented
Aug 10, 2025
| @@ -101,6 +101,7 @@ public class AndroidManifest(public val content: String) { | |||
| @JvmField | |||
| public val DEFAULT_APP: AndroidManifest = app(null) | |||
|
|
|||
| // TODO: stop using package | |||
There was a problem hiding this comment.
Follow-up in separate PR.
d6d4ee2 to
f9f976f
Compare
Job Summary for GradleTest :: gradle
|
autonomousapps
commented
Aug 10, 2025
| @@ -225,7 +225,7 @@ internal class StandardTransform( | |||
| advice += Advice.ofChange( | |||
| coordinates = declarationCoordinates(theDecl), | |||
| fromConfiguration = theDecl.configurationName, | |||
| toConfiguration = usage.toConfiguration() | |||
| toConfiguration = usage.toConfiguration(withFlavor = true) | |||
There was a problem hiding this comment.
delete this new parameter if test suite passes
autonomousapps
commented
Aug 10, 2025
| @@ -440,20 +440,31 @@ internal class StandardTransform( | |||
| } | |||
|
|
|||
| /** e.g., "debug" + "implementation" -> "debugImplementation" */ | |||
| private fun Usage.toConfiguration(forcedKind: SourceKind? = null): String { | |||
| private fun Usage.toConfiguration(forcedKind: SourceKind? = null, withFlavor: Boolean = false): String { | |||
There was a problem hiding this comment.
delete this new parameter if test suite passes
autonomousapps
commented
Aug 10, 2025
| check(bucket != Bucket.NONE) { "You cannot 'declare' an unused dependency" } | ||
|
|
||
| fun processor() = if (isKaptApplied) "kapt" else "annotationProcessor" | ||
|
|
||
| fun SourceKind.configurationNamePrefix(): String = when (kind) { |
Job Summary for GradleTest :: gradle
|
Job Summary for GradleTest :: gradle
|
Job Summary for GradleTest :: gradle
|
407aa75 to
7d43077
Compare
autonomousapps
commented
Aug 10, 2025
Comment on lines
-166
to
173
| // copied from StringsJVM.kt | ||
| /** | ||
| * TODO: Replace this with | ||
| * `String.replaceFirstChar(Char::uppercase)` | ||
| * | ||
| * copied from StringsJVM.kt | ||
| */ | ||
| @Deprecated("Replace with `String.replaceFirstChar(Char::uppercase)`") | ||
| internal fun String.capitalizeSafely(locale: Locale = Locale.ROOT): String { |
a40da43 to
c0c54bf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #1473