ui-layout to MPP
Test: ./gradlew buildOnServer
Change-Id: Iad0c0a2dd0004b38518c6080e721e4e39dab0da2
Relnote: N/A
diff --git a/ui/ui-layout/api/0.1.0-dev15.txt b/ui/ui-layout/api/0.1.0-dev15.txt
index b9c6b5a..88edca5 100644
--- a/ui/ui-layout/api/0.1.0-dev15.txt
+++ b/ui/ui-layout/api/0.1.0-dev15.txt
@@ -118,7 +118,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.ColumnScope INSTANCE;
}
@@ -573,7 +573,7 @@
}
public final class LayoutAspectRatioKt {
- method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+ method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float ratio);
}
public final class LayoutDirectionsKt {
@@ -645,7 +645,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.RowScope INSTANCE;
}
diff --git a/ui/ui-layout/api/current.txt b/ui/ui-layout/api/current.txt
index b9c6b5a..88edca5 100644
--- a/ui/ui-layout/api/current.txt
+++ b/ui/ui-layout/api/current.txt
@@ -118,7 +118,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.ColumnScope INSTANCE;
}
@@ -573,7 +573,7 @@
}
public final class LayoutAspectRatioKt {
- method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+ method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float ratio);
}
public final class LayoutDirectionsKt {
@@ -645,7 +645,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.RowScope INSTANCE;
}
diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt
index b9c6b5a..88edca5 100644
--- a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt
@@ -118,7 +118,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.ColumnScope INSTANCE;
}
@@ -573,7 +573,7 @@
}
public final class LayoutAspectRatioKt {
- method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+ method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float ratio);
}
public final class LayoutDirectionsKt {
@@ -645,7 +645,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.RowScope INSTANCE;
}
diff --git a/ui/ui-layout/api/public_plus_experimental_current.txt b/ui/ui-layout/api/public_plus_experimental_current.txt
index b9c6b5a..88edca5 100644
--- a/ui/ui-layout/api/public_plus_experimental_current.txt
+++ b/ui/ui-layout/api/public_plus_experimental_current.txt
@@ -118,7 +118,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.ColumnScope INSTANCE;
}
@@ -573,7 +573,7 @@
}
public final class LayoutAspectRatioKt {
- method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+ method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float ratio);
}
public final class LayoutDirectionsKt {
@@ -645,7 +645,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.RowScope INSTANCE;
}
diff --git a/ui/ui-layout/api/restricted_0.1.0-dev15.txt b/ui/ui-layout/api/restricted_0.1.0-dev15.txt
index b9c6b5a..88edca5 100644
--- a/ui/ui-layout/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-layout/api/restricted_0.1.0-dev15.txt
@@ -118,7 +118,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.ColumnScope INSTANCE;
}
@@ -573,7 +573,7 @@
}
public final class LayoutAspectRatioKt {
- method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+ method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float ratio);
}
public final class LayoutDirectionsKt {
@@ -645,7 +645,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.RowScope INSTANCE;
}
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index b9c6b5a..88edca5 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -118,7 +118,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.ColumnScope INSTANCE;
}
@@ -573,7 +573,7 @@
}
public final class LayoutAspectRatioKt {
- method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+ method @androidx.compose.Stable public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float ratio);
}
public final class LayoutDirectionsKt {
@@ -645,7 +645,7 @@
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
- method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+ method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
field public static final androidx.ui.layout.RowScope INSTANCE;
}
diff --git a/ui/ui-layout/build.gradle b/ui/ui-layout/build.gradle
index 78b74eb..3bd788a 100644
--- a/ui/ui-layout/build.gradle
+++ b/ui/ui-layout/build.gradle
@@ -20,39 +20,57 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import static androidx.build.dependencies.DependenciesKt.*
-// TODO(mount): Make this platform-independent
+import static androidx.build.dependencies.DependenciesKt.ANDROIDX_TEST_RULES
+import static androidx.build.dependencies.DependenciesKt.ANDROIDX_TEST_RUNNER
+import static androidx.build.dependencies.DependenciesKt.CONSTRAINT_LAYOUT_CORE
+import static androidx.build.dependencies.DependenciesKt.JUNIT
+import static androidx.build.dependencies.DependenciesKt.TRUTH
+import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
plugins {
id("AndroidXPlugin")
id("com.android.library")
id("AndroidXUiPlugin")
- id("org.jetbrains.kotlin.android")
+ id("kotlin-multiplatform")
}
dependencies {
kotlinPlugin project(path: ":compose:compose-compiler")
+}
- implementation(KOTLIN_STDLIB)
+kotlin {
+ android()
+ sourceSets {
+ commonMain.dependencies {
+ implementation(KOTLIN_STDLIB_COMMON)
- api "androidx.annotation:annotation:1.1.0"
+ api project(":ui:ui-core")
+ implementation project(":ui:ui-text")
+ implementation project(":compose:compose-runtime")
+ implementation project(":compose:core:core-util")
+ }
- implementation project(":compose:compose-runtime")
- api project(":ui:ui-core")
- implementation project(":ui:ui-text")
- implementation project(":compose:core:core-util")
- implementation(CONSTRAINT_LAYOUT_CORE)
+ androidMain.dependencies {
+ api "androidx.annotation:annotation:1.1.0"
+ implementation(CONSTRAINT_LAYOUT_CORE)
+ }
- testImplementation(ANDROIDX_TEST_RULES)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
+ androidTest.dependencies {
+ implementation(ANDROIDX_TEST_RULES)
+ implementation(ANDROIDX_TEST_RUNNER)
+ implementation(JUNIT)
+ }
- androidTestImplementation project(":compose:foundation:foundation")
- androidTestImplementation project(":compose:test:test-core")
+ androidAndroidTest.dependencies {
+ implementation project(":compose:foundation:foundation")
+ implementation project(":compose:test:test-core")
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(JUNIT)
- androidTestImplementation(TRUTH)
+ implementation(ANDROIDX_TEST_RULES)
+ implementation(ANDROIDX_TEST_RUNNER)
+ implementation(JUNIT)
+ implementation(TRUTH)
+ }
+ }
}
androidx {
diff --git a/ui/ui-layout/src/androidTest/AndroidManifest.xml b/ui/ui-layout/src/androidAndroidTest/AndroidManifest.xml
similarity index 100%
rename from ui/ui-layout/src/androidTest/AndroidManifest.xml
rename to ui/ui-layout/src/androidAndroidTest/AndroidManifest.xml
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignmentLineTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/AlignmentLineTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignmentLineTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/AlignmentLineTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstraintLayoutTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/ConstraintLayoutTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstraintLayoutTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/ConstraintLayoutTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/ContainerTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/ContainerTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlowTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/FlowTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlowTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/FlowTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/IntrinsicTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/IntrinsicTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/IntrinsicTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/IntrinsicTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutAlignTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutAlignTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutAlignTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutAlignTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutAspectRatioTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutAspectRatioTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutAspectRatioTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutAspectRatioTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutDirectionModifierTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutDirectionModifierTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutDirectionModifierTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutDirectionModifierTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutOffsetTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutOffsetTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutOffsetTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutOffsetTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutPaddingTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutPaddingTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutSizeTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutSizeTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutSizeTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutSizeTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/LayoutTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/OnPositionedTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/OnPositionedTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/RowColumnTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/RowColumnTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/RowColumnTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/RowColumnTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/SpacerTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/SpacerTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/StackTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/StackTest.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TestActivity.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/TestActivity.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TestActivity.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/TestActivity.kt
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TextLayoutDirectionModifierTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/TextLayoutDirectionModifierTest.kt
similarity index 100%
rename from ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TextLayoutDirectionModifierTest.kt
rename to ui/ui-layout/src/androidAndroidTest/kotlin/androidx/ui/layout/test/TextLayoutDirectionModifierTest.kt
diff --git a/ui/ui-layout/src/main/AndroidManifest.xml b/ui/ui-layout/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from ui/ui-layout/src/main/AndroidManifest.xml
rename to ui/ui-layout/src/androidMain/AndroidManifest.xml
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt b/ui/ui-layout/src/androidMain/kotlin/androidx/ui/layout/ConstraintLayout.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
rename to ui/ui-layout/src/androidMain/kotlin/androidx/ui/layout/ConstraintLayout.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/AlignmentLine.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/AlignmentLine.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Column.kt
similarity index 97%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Column.kt
index 12e5436..3761df3 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
+++ b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Column.kt
@@ -16,7 +16,6 @@
package androidx.ui.layout
-import androidx.annotation.FloatRange
import androidx.compose.Composable
import androidx.compose.Immutable
import androidx.compose.Stable
@@ -26,6 +25,8 @@
import androidx.ui.core.VerticalAlignmentLine
import androidx.ui.layout.ColumnScope.alignWithSiblings
import androidx.ui.layout.RowScope.alignWithSiblings
+import androidx.ui.util.annotation.FloatRange
+
/**
* A layout composable that places its children in a vertical sequence. For a layout composable
* that places its children in a horizontal sequence, see [Row].
@@ -124,7 +125,8 @@
*/
@Stable
fun Modifier.weight(
- @FloatRange(from = 0.0, fromInclusive = false) weight: Float,
+ @FloatRange(from = 0.0, to = 3.4e38 /* POSITIVE_INFINITY */, fromInclusive = false)
+ weight: Float,
fill: Boolean = true
): Modifier {
require(weight > 0.0) { "invalid weight $weight; must be greater than zero" }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/DpConstraints.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/DpConstraints.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/DpConstraints.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/DpConstraints.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/ExperimentalLayout.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/ExperimentalLayout.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/ExperimentalLayout.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/ExperimentalLayout.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Flow.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Flow.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Intrinsic.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Intrinsic.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutAspectRatio.kt
similarity index 97%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutAspectRatio.kt
index c7d8804..4c891a2 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
+++ b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutAspectRatio.kt
@@ -16,7 +16,6 @@
package androidx.ui.layout
-import androidx.annotation.FloatRange
import androidx.compose.Stable
import androidx.ui.core.Constraints
import androidx.ui.core.IntrinsicMeasurable
@@ -28,6 +27,7 @@
import androidx.ui.core.Modifier
import androidx.ui.core.satisfiedBy
import androidx.ui.unit.IntSize
+import androidx.ui.util.annotation.FloatRange
import kotlin.math.roundToInt
/**
@@ -43,7 +43,7 @@
*/
@Stable
fun Modifier.aspectRatio(
- @FloatRange(from = 0.0, fromInclusive = false)
+ @FloatRange(from = 0.0, to = 3.4e38 /* POSITIVE_INFINITY */, fromInclusive = false)
ratio: Float
) = this + AspectRatioModifier(ratio)
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutDirections.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutDirections.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutOffset.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutOffset.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/LayoutOffset.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutOffset.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutPadding.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutPadding.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutScopeMarker.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutScopeMarker.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/LayoutScopeMarker.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutScopeMarker.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutSize.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/LayoutSize.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Row.kt
similarity index 97%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Row.kt
index e3aa16b1..ece82731 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
+++ b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Row.kt
@@ -16,7 +16,6 @@
package androidx.ui.layout
-import androidx.annotation.FloatRange
import androidx.compose.Composable
import androidx.compose.Immutable
import androidx.compose.Stable
@@ -24,6 +23,8 @@
import androidx.ui.core.HorizontalAlignmentLine
import androidx.ui.core.Measured
import androidx.ui.core.Modifier
+import androidx.ui.util.annotation.FloatRange
+
/**
* A layout composable that places its children in a horizontal sequence. For a layout composable
* that places its children in a vertical sequence, see [Column].
@@ -122,7 +123,8 @@
*/
@Stable
fun Modifier.weight(
- @FloatRange(from = 0.0, fromInclusive = false) weight: Float,
+ @FloatRange(from = 0.0, to = 3.4e38 /* POSITIVE_INFINITY */, fromInclusive = false)
+ weight: Float,
fill: Boolean = true
): Modifier {
require(weight > 0.0) { "invalid weight $weight; must be greater than zero" }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/RowColumnImpl.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/RowColumnImpl.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/RowColumnImpl.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/RowColumnImpl.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Spacer.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Spacer.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Spacer.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Spacer.kt
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt b/ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Stack.kt
similarity index 100%
rename from ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
rename to ui/ui-layout/src/commonMain/kotlin/androidx/ui/layout/Stack.kt