Status Update
Comments
au...@google.com <au...@google.com> #2
Branch: androidx-master-dev
commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020
Semantics no-op cleanups
Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:
- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".
- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)
- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)
Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."
Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc
M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt
da...@google.com <da...@google.com> #3
Do you have a CL / topic I can use with the Kotlin upgrade in-progress so we can investigate?
il...@google.com <il...@google.com>
da...@google.com <da...@google.com> #5
I can't figure this one out... We use Gradke's Test Kit (
Some interesting things... adding the following debug lines to the test when Kotlin is suppose to be 1.4:
println(KotlinVersion.CURRENT)
println(System.getProperty(System.getProperty("java.class.path")!!.replace(':', '\n')))
print the following: /usr/local/google/home/danysantiago/.gradle/wrapper/dists/gradle-6.5.1-bin/1xb5adrwzprfzochsd294a1j8/gradle-6.5.1/lib/kotlin-stdlib-1.3.72.jar
.
Meanwhile if I revert the Kotlin version in AndroidX to 1.3.71 I get the following output:
The diff between these two outputs (and the classpath) is here:
One part that is a unknown to me is the effect of the gradleTestKit()
function used to add the dependency
da...@google.com <da...@google.com> #6
Another thing I tried: If I take the test project (in build.gradle
we create in the test along with actually adding a buildscript
closure (not needed in the actual test since its suppose to come from the test kit), the test project then builds, I attached it for reference.
au...@google.com <au...@google.com> #7
+gavra@ in case he as insights on how to force a kotlin plugin version to 1.4 in these tests.
ga...@google.com <ga...@google.com> #8
Looking at Dependencies.kt
.
@aurimas Your CLs do not seem to update that. Can you try running the tests with that change?
ap...@google.com <ap...@google.com> #9
Branch: androidx-master-dev
commit 33ebdb9c4da8e3bbdc297bab586eeb84d1e83855
Author: Aurimas Liutikas <aurimas@google.com>
Date: Mon Aug 17 08:53:12 2020
Upgrade androidx to Kotlin 1.4
- clean up new Kotlin warnings after upgrading.
- enable multidex for appcompat and preference tests as
we are hitting dex limit
- remove new redundant extension method in fragment-ktx
Test: ./busytown/androidx.sh
Bug: 165307851, 165300826
Relnote: Upgrade androidx to use Kotlin 1.4
Change-Id: Id647100407925c16d734c8c43392b4e2d108d0e3
M appcompat/appcompat/build.gradle
M appcompat/appcompat/src/androidTest/AndroidManifest.xml
M buildSrc/build_dependencies.gradle
M camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeApplication.kt
M camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt
M camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/CameraUtils.kt
M core/core-ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
M dynamic-animation/dynamic-animation-ktx/api/current.txt
M dynamic-animation/dynamic-animation-ktx/api/public_plus_experimental_current.txt
M dynamic-animation/dynamic-animation-ktx/api/restricted_current.txt
M fragment/fragment-ktx/api/current.txt
M fragment/fragment-ktx/api/public_plus_experimental_current.txt
M fragment/fragment-ktx/api/restricted_current.txt
M fragment/fragment-ktx/src/main/java/androidx/fragment/app/Fragment.kt
D fragment/fragment-ktx/src/main/java/androidx/fragment/app/FragmentResultOwner.kt
M gradle.properties
M jetifier/jetifier/core/src/test/kotlin/com/android/tools/build/jetifier/core/config/ConfigParserTest.kt
M jetifier/jetifier/processor/src/main/kotlin/com/android/tools/build/jetifier/processor/Processor.kt
M lifecycle/integration-tests/kotlintestapp/src/test-common/java/androidx.lifecycle/LifecycleCoroutineScopeTestBase.kt
M lifecycle/lifecycle-livedata-core-ktx/src/test/java/androidx/lifecycle/LiveDataTest.kt
M lifecycle/lifecycle-livedata-ktx/src/test/java/androidx/lifecycle/TransformationsTest.kt
M lifecycle/lifecycle-viewmodel-ktx/src/androidTest/java/androidx/lifecycle/ViewModelTest.kt
M navigation/navigation-safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/IncrementalPluginTest.kt
M navigation/navigation-safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/KotlinPluginTest.kt
M paging/common/src/main/kotlin/androidx/paging/PagePresenter.kt
M paging/common/src/test/kotlin/androidx/paging/CachingTest.kt
M paging/samples/src/main/java/androidx/paging/samples/PagingDataAdapterSample.kt
M preference/preference/build.gradle
M recyclerview/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerRemoveShownItemsTest.kt
M room/compiler/src/test/kotlin/androidx/room/ext/ElementExtTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTargetMethodTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/autovalue/AutoValuePojoProcessorDelegateTest.kt
M room/compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BooksDaoTest.kt
M samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentViewModelSupport.kt
M viewpager2/viewpager2/src/androidTest/java/androidx/viewpager2/widget/MutableCollectionsTest.kt
au...@google.com <au...@google.com> #10
It seems to have fixed itself #yolo
cj...@gmail.com <cj...@gmail.com> #11
#YOLO :pray:
ap...@google.com <ap...@google.com> #12
Branch: androidx-master-dev
commit 33ebdb9c4da8e3bbdc297bab586eeb84d1e83855
Author: Aurimas Liutikas <aurimas@google.com>
Date: Mon Aug 17 08:53:12 2020
Upgrade androidx to Kotlin 1.4
- clean up new Kotlin warnings after upgrading.
- enable multidex for appcompat and preference tests as
we are hitting dex limit
- remove new redundant extension method in fragment-ktx
Test: ./busytown/androidx.sh
Bug: 165307851, 165300826
Relnote: Upgrade androidx to use Kotlin 1.4
Change-Id: Id647100407925c16d734c8c43392b4e2d108d0e3
M lifecycle/lifecycle-viewmodel-ktx/src/androidTest/java/androidx/lifecycle/ViewModelTest.kt
M lifecycle/integration-tests/kotlintestapp/src/test-common/java/androidx.lifecycle/LifecycleCoroutineScopeTestBase.kt
M appcompat/appcompat/build.gradle
M navigation/navigation-safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/IncrementalPluginTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/autovalue/AutoValuePojoProcessorDelegateTest.kt
M lifecycle/lifecycle-livedata-core-ktx/src/test/java/androidx/lifecycle/LiveDataTest.kt
M camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeApplication.kt
M buildSrc/build_dependencies.gradle
M jetifier/jetifier/processor/src/main/kotlin/com/android/tools/build/jetifier/processor/Processor.kt
M samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentViewModelSupport.kt
M appcompat/appcompat/src/androidTest/AndroidManifest.xml
M dynamic-animation/dynamic-animation-ktx/api/restricted_current.txt
M preference/preference/build.gradle
M paging/common/src/main/kotlin/androidx/paging/PagePresenter.kt
M lifecycle/lifecycle-livedata-ktx/src/test/java/androidx/lifecycle/TransformationsTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTargetMethodTest.kt
M room/compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
M jetifier/jetifier/core/src/test/kotlin/com/android/tools/build/jetifier/core/config/ConfigParserTest.kt
M dynamic-animation/dynamic-animation-ktx/api/current.txt
M fragment/fragment-ktx/api/public_plus_experimental_current.txt
M paging/samples/src/main/java/androidx/paging/samples/PagingDataAdapterSample.kt
M fragment/fragment-ktx/api/current.txt
M core/core-ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
M fragment/fragment-ktx/api/restricted_current.txt
M navigation/navigation-safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/KotlinPluginTest.kt
M room/compiler/src/test/kotlin/androidx/room/processor/ProjectionExpanderTest.kt
M gradle.properties
M viewpager2/viewpager2/src/androidTest/java/androidx/viewpager2/widget/MutableCollectionsTest.kt
M recyclerview/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerRemoveShownItemsTest.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BooksDaoTest.kt
M camera/integration-tests/camerapipetestapp/src/main/java/androidx/camera/integration/camera2/pipe/SimpleCamera.kt
M paging/common/src/test/kotlin/androidx/paging/CachingTest.kt
M fragment/fragment-ktx/src/main/java/androidx/fragment/app/Fragment.kt
M camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/CameraUtils.kt
D fragment/fragment-ktx/src/main/java/androidx/fragment/app/FragmentResultOwner.kt
M dynamic-animation/dynamic-animation-ktx/api/public_plus_experimental_current.txt
M room/compiler/src/test/kotlin/androidx/room/ext/ElementExtTest.kt
Description