Skip to content

Commit 04ab6dc

Browse files
authored
Merge branch 'JetBrains:jb-main' into objoptimization
2 parents 3809698 + e3907ff commit 04ab6dc

4 files changed

Lines changed: 31 additions & 1 deletion

File tree

compose/animation/animation/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,13 @@ androidx {
137137
description = "Compose animation library"
138138
samples(project(":compose:animation:animation:animation-samples"))
139139
}
140+
141+
//TODO(b/407640608): Fix to work without this block for PaneMotionTest.test_allDefaultPaneMotionTransitions
142+
tasks.withType(KotlinCompile).configureEach {
143+
if (it.name != "compileAndroidMain") return
144+
kotlinOptions {
145+
freeCompilerArgs += [
146+
"-Xlambdas=class"
147+
]
148+
}
149+
}

compose/foundation/foundation/src/webMain/kotlin/androidx/compose/foundation/Clickable.web.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
package androidx.compose.foundation
1818

1919
// TODO: b/168524931 - should this depend on the input device?
20-
internal actual val TapIndicationDelay: Long = 0L
20+
internal actual val TapIndicationDelay: Long = 150L

compose/ui/ui-graphics/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,16 @@ androidx {
179179
samples(project(":compose:ui:ui-graphics:ui-graphics-samples"))
180180
}
181181

182+
// TODO(b/407640608): Task :compose:ui:ui-inspection:connectedCheck fails without this block
183+
tasks.withType(KotlinCompile).configureEach {
184+
if (it.name != "compileAndroidMain") return
185+
kotlinOptions {
186+
freeCompilerArgs += [
187+
"-Xlambdas=class"
188+
]
189+
}
190+
}
191+
182192
tasks.findByName("desktopTest").configure {
183193
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden"
184194
}

compose/ui/ui/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,16 @@ if (!ProjectLayoutType.isPlayground(project)) {
329329
}
330330
}
331331

332+
// TODO(b/407725586): Remove this block when AndroidAssistTest passes on API Level 21
333+
tasks.withType(KotlinCompile).configureEach {
334+
if (it.name != "compileAndroidMain") return
335+
kotlinOptions {
336+
freeCompilerArgs += [
337+
"-Xlambdas=class"
338+
]
339+
}
340+
}
341+
332342
// This task updates the translations of the localizable strings for the desktopMain target.
333343
// It obtains them from Android's base repository.
334344
tasks.register("updateTranslations", UpdateTranslationsTask.class) {

0 commit comments

Comments
 (0)