Skip to content

Commit 024e85a

Browse files
authored
Copy Compose 1.9.0-alpha01 state (#2061)
``` COMPOSE = "1.9.0-alpha01" COMPOSE_MATERIAL3 = "1.4.0-alpha13" COMPOSE_MATERIAL3_ADAPTIVE = "1.2.0-alpha04" ``` It's a copy of `compose/*` from `integration` branch state after merging `008cbd021e3a2b4d1f36ea7f48200c4692bfc169` from AOSP. Please note that this time it's only partial copy with backporting gradle scripts to `jb-main` state because updated `buildSrc` from `integration` isn't quite ready yet. ## Release Notes N/A
2 parents f1b9c3f + 2e5687b commit 024e85a

File tree

2,997 files changed

+184757
-112745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,997 files changed

+184757
-112745
lines changed

buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetBrainsAndroidXImplPlugin.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ open class JetbrainsExtensions(
103103
c?.resolutionStrategy {
104104
it.dependencySubstitution {
105105
projectPathToRedirectingVersionMap.forEach { path, version ->
106-
val artifact = path.replaceFirst(":", "").let {
107-
"androidx.$it:$version"
108-
}
106+
val pathElements = path.split(":").filter { it.isNotEmpty() }
107+
val group = pathElements.dropLast(1).joinToString(".")
108+
val module = pathElements.last()
109+
val artifact = "androidx.$group:$module:$version"
109110
it.substitute(it.project(path)).using(it.module(artifact))
110111
}
111112
}

compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/AnimationCoreIssueRegistry.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ class AnimationCoreIssueRegistry : IssueRegistry() {
2929
get() =
3030
listOf(
3131
TransitionDetector.UnusedTransitionTargetStateParameter,
32-
UnrememberedAnimatableDetector.UnrememberedAnimatable,
3332
ArcAnimationSpecTypeDetector.ArcAnimationSpecTypeIssue
3433
)
3534

35+
// Now handled by RememberInComposition
36+
override val deletedIssues = listOf("UnrememberedAnimatable")
37+
3638
override val vendor =
3739
Vendor(
3840
vendorName = "Jetpack Compose",

compose/animation/animation-core-lint/src/main/java/androidx/compose/animation/core/lint/UnrememberedAnimatableDetector.kt

Lines changed: 0 additions & 96 deletions
This file was deleted.

compose/animation/animation-core-lint/src/test/java/androidx/compose/animation/core/lint/ArcAnimationSpecTypeDetectorTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,15 @@ fun test() {
219219
)
220220
.run()
221221
.expect(
222-
"""src/foo/test.kt:14: Information: Arc animation is intended for 2D values such as Offset, IntOffset or DpOffset.
222+
"""src/foo/test.kt:14: Hint: Arc animation is intended for 2D values such as Offset, IntOffset or DpOffset.
223223
Otherwise, the animation might not be what you expect. [ArcAnimationSpecTypeIssue]
224224
ArcAnimationSpec<Float>(ArcAbove)
225225
~~~~~~~~~~~~~~~~
226-
src/foo/test.kt:15: Information: Arc animation is intended for 2D values such as Offset, IntOffset or DpOffset.
226+
src/foo/test.kt:15: Hint: Arc animation is intended for 2D values such as Offset, IntOffset or DpOffset.
227227
Otherwise, the animation might not be what you expect. [ArcAnimationSpecTypeIssue]
228228
ArcAnimationSpec<String>(ArcAbove)
229229
~~~~~~~~~~~~~~~~
230-
0 errors, 0 warnings"""
230+
0 errors, 0 warnings, 2 hints"""
231231
)
232232
}
233233
}

0 commit comments

Comments
 (0)