Refactors androidx.compose.runtime:runtime-dispatch to the androidx.compose.runtime.dispatch package name
Bug: b/160233169
Test: ./gradlew checkApi
Relnote: N/A
Change-Id: Ia483ab4b30acfbea7fce89923702dc182a96c1e7
diff --git a/compose/compose-dispatch/api/0.1.0-dev16.txt b/compose/compose-dispatch/api/0.1.0-dev16.txt
index 15547a8..b418c73 100644
--- a/compose/compose-dispatch/api/0.1.0-dev16.txt
+++ b/compose/compose-dispatch/api/0.1.0-dev16.txt
@@ -1,16 +1,16 @@
// Signature format: 3.0
-package androidx.compose.dispatch {
+package androidx.compose.runtime.dispatch {
public final class ActualAndroidKt {
- method public static androidx.compose.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ method public static androidx.compose.runtime.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
}
public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
method public android.view.Choreographer getChoreographer();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
- field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion Companion;
}
public static final class AndroidUiDispatcher.Companion {
@@ -23,7 +23,7 @@
public final class AndroidUiDispatcherKt {
}
- public final class AndroidUiFrameClock implements androidx.compose.dispatch.MonotonicFrameClock {
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
method public android.view.Choreographer getChoreographer();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
@@ -33,14 +33,14 @@
method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
property public default kotlin.coroutines.CoroutineContext.Key<?> key;
- field public static final androidx.compose.dispatch.MonotonicFrameClock.Key Key;
+ field public static final androidx.compose.runtime.dispatch.MonotonicFrameClock.Key Key;
}
- public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.dispatch.MonotonicFrameClock> {
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.dispatch.MonotonicFrameClock> {
}
public final class MonotonicFrameClockKt {
- method public static suspend inline <R> Object? withFrameMillis(androidx.compose.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
diff --git a/compose/compose-dispatch/api/current.txt b/compose/compose-dispatch/api/current.txt
index 15547a8..b418c73 100644
--- a/compose/compose-dispatch/api/current.txt
+++ b/compose/compose-dispatch/api/current.txt
@@ -1,16 +1,16 @@
// Signature format: 3.0
-package androidx.compose.dispatch {
+package androidx.compose.runtime.dispatch {
public final class ActualAndroidKt {
- method public static androidx.compose.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ method public static androidx.compose.runtime.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
}
public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
method public android.view.Choreographer getChoreographer();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
- field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion Companion;
}
public static final class AndroidUiDispatcher.Companion {
@@ -23,7 +23,7 @@
public final class AndroidUiDispatcherKt {
}
- public final class AndroidUiFrameClock implements androidx.compose.dispatch.MonotonicFrameClock {
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
method public android.view.Choreographer getChoreographer();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
@@ -33,14 +33,14 @@
method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
property public default kotlin.coroutines.CoroutineContext.Key<?> key;
- field public static final androidx.compose.dispatch.MonotonicFrameClock.Key Key;
+ field public static final androidx.compose.runtime.dispatch.MonotonicFrameClock.Key Key;
}
- public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.dispatch.MonotonicFrameClock> {
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.dispatch.MonotonicFrameClock> {
}
public final class MonotonicFrameClockKt {
- method public static suspend inline <R> Object? withFrameMillis(androidx.compose.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
diff --git a/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev16.txt b/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev16.txt
index 15547a8..b418c73 100644
--- a/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev16.txt
@@ -1,16 +1,16 @@
// Signature format: 3.0
-package androidx.compose.dispatch {
+package androidx.compose.runtime.dispatch {
public final class ActualAndroidKt {
- method public static androidx.compose.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ method public static androidx.compose.runtime.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
}
public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
method public android.view.Choreographer getChoreographer();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
- field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion Companion;
}
public static final class AndroidUiDispatcher.Companion {
@@ -23,7 +23,7 @@
public final class AndroidUiDispatcherKt {
}
- public final class AndroidUiFrameClock implements androidx.compose.dispatch.MonotonicFrameClock {
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
method public android.view.Choreographer getChoreographer();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
@@ -33,14 +33,14 @@
method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
property public default kotlin.coroutines.CoroutineContext.Key<?> key;
- field public static final androidx.compose.dispatch.MonotonicFrameClock.Key Key;
+ field public static final androidx.compose.runtime.dispatch.MonotonicFrameClock.Key Key;
}
- public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.dispatch.MonotonicFrameClock> {
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.dispatch.MonotonicFrameClock> {
}
public final class MonotonicFrameClockKt {
- method public static suspend inline <R> Object? withFrameMillis(androidx.compose.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
diff --git a/compose/compose-dispatch/api/public_plus_experimental_current.txt b/compose/compose-dispatch/api/public_plus_experimental_current.txt
index 15547a8..b418c73 100644
--- a/compose/compose-dispatch/api/public_plus_experimental_current.txt
+++ b/compose/compose-dispatch/api/public_plus_experimental_current.txt
@@ -1,16 +1,16 @@
// Signature format: 3.0
-package androidx.compose.dispatch {
+package androidx.compose.runtime.dispatch {
public final class ActualAndroidKt {
- method public static androidx.compose.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ method public static androidx.compose.runtime.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
}
public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
method public android.view.Choreographer getChoreographer();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
- field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion Companion;
}
public static final class AndroidUiDispatcher.Companion {
@@ -23,7 +23,7 @@
public final class AndroidUiDispatcherKt {
}
- public final class AndroidUiFrameClock implements androidx.compose.dispatch.MonotonicFrameClock {
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
method public android.view.Choreographer getChoreographer();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
@@ -33,14 +33,14 @@
method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
property public default kotlin.coroutines.CoroutineContext.Key<?> key;
- field public static final androidx.compose.dispatch.MonotonicFrameClock.Key Key;
+ field public static final androidx.compose.runtime.dispatch.MonotonicFrameClock.Key Key;
}
- public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.dispatch.MonotonicFrameClock> {
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.dispatch.MonotonicFrameClock> {
}
public final class MonotonicFrameClockKt {
- method public static suspend inline <R> Object? withFrameMillis(androidx.compose.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
diff --git a/compose/compose-dispatch/api/restricted_0.1.0-dev16.txt b/compose/compose-dispatch/api/restricted_0.1.0-dev16.txt
index 15547a8..b418c73 100644
--- a/compose/compose-dispatch/api/restricted_0.1.0-dev16.txt
+++ b/compose/compose-dispatch/api/restricted_0.1.0-dev16.txt
@@ -1,16 +1,16 @@
// Signature format: 3.0
-package androidx.compose.dispatch {
+package androidx.compose.runtime.dispatch {
public final class ActualAndroidKt {
- method public static androidx.compose.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ method public static androidx.compose.runtime.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
}
public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
method public android.view.Choreographer getChoreographer();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
- field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion Companion;
}
public static final class AndroidUiDispatcher.Companion {
@@ -23,7 +23,7 @@
public final class AndroidUiDispatcherKt {
}
- public final class AndroidUiFrameClock implements androidx.compose.dispatch.MonotonicFrameClock {
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
method public android.view.Choreographer getChoreographer();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
@@ -33,14 +33,14 @@
method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
property public default kotlin.coroutines.CoroutineContext.Key<?> key;
- field public static final androidx.compose.dispatch.MonotonicFrameClock.Key Key;
+ field public static final androidx.compose.runtime.dispatch.MonotonicFrameClock.Key Key;
}
- public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.dispatch.MonotonicFrameClock> {
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.dispatch.MonotonicFrameClock> {
}
public final class MonotonicFrameClockKt {
- method public static suspend inline <R> Object? withFrameMillis(androidx.compose.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
diff --git a/compose/compose-dispatch/api/restricted_current.txt b/compose/compose-dispatch/api/restricted_current.txt
index 15547a8..b418c73 100644
--- a/compose/compose-dispatch/api/restricted_current.txt
+++ b/compose/compose-dispatch/api/restricted_current.txt
@@ -1,16 +1,16 @@
// Signature format: 3.0
-package androidx.compose.dispatch {
+package androidx.compose.runtime.dispatch {
public final class ActualAndroidKt {
- method public static androidx.compose.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ method public static androidx.compose.runtime.dispatch.MonotonicFrameClock getDefaultMonotonicFrameClock();
}
public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
method public android.view.Choreographer getChoreographer();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
- field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion Companion;
}
public static final class AndroidUiDispatcher.Companion {
@@ -23,7 +23,7 @@
public final class AndroidUiDispatcherKt {
}
- public final class AndroidUiFrameClock implements androidx.compose.dispatch.MonotonicFrameClock {
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
method public android.view.Choreographer getChoreographer();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
@@ -33,14 +33,14 @@
method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
property public default kotlin.coroutines.CoroutineContext.Key<?> key;
- field public static final androidx.compose.dispatch.MonotonicFrameClock.Key Key;
+ field public static final androidx.compose.runtime.dispatch.MonotonicFrameClock.Key Key;
}
- public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.dispatch.MonotonicFrameClock> {
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.dispatch.MonotonicFrameClock> {
}
public final class MonotonicFrameClockKt {
- method public static suspend inline <R> Object? withFrameMillis(androidx.compose.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.dispatch.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
diff --git a/compose/compose-dispatch/src/androidAndroidTest/AndroidManifest.xml b/compose/compose-dispatch/src/androidAndroidTest/AndroidManifest.xml
index a6c2833..856ea08 100644
--- a/compose/compose-dispatch/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/compose-dispatch/src/androidAndroidTest/AndroidManifest.xml
@@ -15,8 +15,8 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.dispatch.test">
+ package="androidx.compose.runtime.dispatch">
<application>
- <activity android:name="androidx.compose.dispatch.TestActivity" />
+ <activity android:name="androidx.compose.runtime.dispatch.TestActivity" />
</application>
</manifest>
diff --git a/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/dispatch/AndroidUiDispatcherTest.kt b/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/runtime/dispatch/AndroidUiDispatcherTest.kt
similarity index 99%
rename from compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/dispatch/AndroidUiDispatcherTest.kt
rename to compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/runtime/dispatch/AndroidUiDispatcherTest.kt
index 2108a349..a46885d 100644
--- a/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/dispatch/AndroidUiDispatcherTest.kt
+++ b/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/runtime/dispatch/AndroidUiDispatcherTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import android.graphics.Rect
import android.view.Choreographer
diff --git a/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/dispatch/TestActivity.kt b/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/runtime/dispatch/TestActivity.kt
similarity index 94%
rename from compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/dispatch/TestActivity.kt
rename to compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/runtime/dispatch/TestActivity.kt
index 4afcf14..83fa029 100644
--- a/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/dispatch/TestActivity.kt
+++ b/compose/compose-dispatch/src/androidAndroidTest/kotlin/androidx/compose/runtime/dispatch/TestActivity.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import androidx.core.app.ComponentActivity
diff --git a/compose/compose-dispatch/src/androidMain/AndroidManifest.xml b/compose/compose-dispatch/src/androidMain/AndroidManifest.xml
index c63b040..fbe2c27 100644
--- a/compose/compose-dispatch/src/androidMain/AndroidManifest.xml
+++ b/compose/compose-dispatch/src/androidMain/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.compose.dispatch"/>
+<manifest package="androidx.compose.runtime.dispatch"/>
diff --git a/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/ActualAndroid.kt b/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/ActualAndroid.kt
similarity index 97%
rename from compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/ActualAndroid.kt
rename to compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/ActualAndroid.kt
index 7249b60..1beb3a0 100644
--- a/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/ActualAndroid.kt
+++ b/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/ActualAndroid.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import android.os.Looper
import kotlinx.coroutines.Dispatchers
diff --git a/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/AndroidUiDispatcher.kt b/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/AndroidUiDispatcher.kt
similarity index 97%
rename from compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/AndroidUiDispatcher.kt
rename to compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/AndroidUiDispatcher.kt
index 3a2405e..a468bb7 100644
--- a/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/AndroidUiDispatcher.kt
+++ b/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/AndroidUiDispatcher.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import android.os.Looper
import android.view.Choreographer
-import androidx.compose.dispatch.AndroidUiDispatcher.Companion.CurrentThread
-import androidx.compose.dispatch.AndroidUiDispatcher.Companion.Main
+import androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion.CurrentThread
+import androidx.compose.runtime.dispatch.AndroidUiDispatcher.Companion.Main
import androidx.core.os.HandlerCompat
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
diff --git a/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/AndroidUiFrameClock.kt b/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/AndroidUiFrameClock.kt
similarity index 97%
rename from compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/AndroidUiFrameClock.kt
rename to compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/AndroidUiFrameClock.kt
index 5f04241..71318f4 100644
--- a/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/dispatch/AndroidUiFrameClock.kt
+++ b/compose/compose-dispatch/src/androidMain/kotlin/androidx/compose/runtime/dispatch/AndroidUiFrameClock.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import android.view.Choreographer
import kotlinx.coroutines.suspendCancellableCoroutine
diff --git a/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/dispatch/Expect.kt b/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/runtime/dispatch/Expect.kt
similarity index 96%
rename from compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/dispatch/Expect.kt
rename to compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/runtime/dispatch/Expect.kt
index 60b9777..44010e8 100644
--- a/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/dispatch/Expect.kt
+++ b/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/runtime/dispatch/Expect.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
/**
* The [MonotonicFrameClock] used by [withFrameNanos] and [withFrameMillis] if one is not present
diff --git a/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/dispatch/MonotonicFrameClock.kt b/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/runtime/dispatch/MonotonicFrameClock.kt
similarity index 98%
rename from compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/dispatch/MonotonicFrameClock.kt
rename to compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/runtime/dispatch/MonotonicFrameClock.kt
index 055d94b..157c309 100644
--- a/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/dispatch/MonotonicFrameClock.kt
+++ b/compose/compose-dispatch/src/commonMain/kotlin/androidx/compose/runtime/dispatch/MonotonicFrameClock.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.coroutineContext
diff --git a/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/dispatch/ActualDesktop.kt b/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/runtime/dispatch/ActualDesktop.kt
similarity index 94%
rename from compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/dispatch/ActualDesktop.kt
rename to compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/runtime/dispatch/ActualDesktop.kt
index baa6d0f..2411c19 100644
--- a/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/dispatch/ActualDesktop.kt
+++ b/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/runtime/dispatch/ActualDesktop.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
actual val DefaultMonotonicFrameClock: MonotonicFrameClock by lazy {
DesktopUiDispatcher.Dispatcher.frameClock
diff --git a/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/dispatch/DesktopUiDispatcher.kt b/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/runtime/dispatch/DesktopUiDispatcher.kt
similarity index 98%
rename from compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/dispatch/DesktopUiDispatcher.kt
rename to compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/runtime/dispatch/DesktopUiDispatcher.kt
index 5b7082e..6e0a25c 100644
--- a/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/dispatch/DesktopUiDispatcher.kt
+++ b/compose/compose-dispatch/src/desktopMain/kotlin/androidx/compose/runtime/dispatch/DesktopUiDispatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.compose.dispatch
+package androidx.compose.runtime.dispatch
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Runnable
diff --git a/compose/compose-runtime/api/0.1.0-dev16.txt b/compose/compose-runtime/api/0.1.0-dev16.txt
index 10dda20..4238932 100644
--- a/compose/compose-runtime/api/0.1.0-dev16.txt
+++ b/compose/compose-runtime/api/0.1.0-dev16.txt
@@ -166,12 +166,12 @@
method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.dispatch.MonotonicFrameClock {
+ public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public CompositionCoroutineScope();
method @Deprecated public final suspend Object? awaitFrame(kotlin.coroutines.Continuation<? super java.lang.Long> p);
}
- @Deprecated public interface CompositionFrameClock extends androidx.compose.dispatch.MonotonicFrameClock {
+ @Deprecated public interface CompositionFrameClock extends androidx.compose.runtime.dispatch.MonotonicFrameClock {
method @Deprecated public default suspend <R> Object? awaitFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
@@ -337,12 +337,12 @@
ctor public Recomposer();
method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public androidx.compose.EmbeddingContext getEmbeddingContext();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
method public boolean hasPendingChanges();
method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<?> p);
method public void setEmbeddingContext(androidx.compose.EmbeddingContext p);
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
field public static final androidx.compose.Recomposer.Companion Companion;
}
diff --git a/compose/compose-runtime/api/current.txt b/compose/compose-runtime/api/current.txt
index 10dda20..4238932 100644
--- a/compose/compose-runtime/api/current.txt
+++ b/compose/compose-runtime/api/current.txt
@@ -166,12 +166,12 @@
method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.dispatch.MonotonicFrameClock {
+ public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public CompositionCoroutineScope();
method @Deprecated public final suspend Object? awaitFrame(kotlin.coroutines.Continuation<? super java.lang.Long> p);
}
- @Deprecated public interface CompositionFrameClock extends androidx.compose.dispatch.MonotonicFrameClock {
+ @Deprecated public interface CompositionFrameClock extends androidx.compose.runtime.dispatch.MonotonicFrameClock {
method @Deprecated public default suspend <R> Object? awaitFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
@@ -337,12 +337,12 @@
ctor public Recomposer();
method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public androidx.compose.EmbeddingContext getEmbeddingContext();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
method public boolean hasPendingChanges();
method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<?> p);
method public void setEmbeddingContext(androidx.compose.EmbeddingContext p);
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
field public static final androidx.compose.Recomposer.Companion Companion;
}
diff --git a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev16.txt b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev16.txt
index 10dda20..4238932 100644
--- a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev16.txt
@@ -166,12 +166,12 @@
method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.dispatch.MonotonicFrameClock {
+ public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public CompositionCoroutineScope();
method @Deprecated public final suspend Object? awaitFrame(kotlin.coroutines.Continuation<? super java.lang.Long> p);
}
- @Deprecated public interface CompositionFrameClock extends androidx.compose.dispatch.MonotonicFrameClock {
+ @Deprecated public interface CompositionFrameClock extends androidx.compose.runtime.dispatch.MonotonicFrameClock {
method @Deprecated public default suspend <R> Object? awaitFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
@@ -337,12 +337,12 @@
ctor public Recomposer();
method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public androidx.compose.EmbeddingContext getEmbeddingContext();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
method public boolean hasPendingChanges();
method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<?> p);
method public void setEmbeddingContext(androidx.compose.EmbeddingContext p);
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
field public static final androidx.compose.Recomposer.Companion Companion;
}
diff --git a/compose/compose-runtime/api/public_plus_experimental_current.txt b/compose/compose-runtime/api/public_plus_experimental_current.txt
index 10dda20..4238932 100644
--- a/compose/compose-runtime/api/public_plus_experimental_current.txt
+++ b/compose/compose-runtime/api/public_plus_experimental_current.txt
@@ -166,12 +166,12 @@
method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.dispatch.MonotonicFrameClock {
+ public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public CompositionCoroutineScope();
method @Deprecated public final suspend Object? awaitFrame(kotlin.coroutines.Continuation<? super java.lang.Long> p);
}
- @Deprecated public interface CompositionFrameClock extends androidx.compose.dispatch.MonotonicFrameClock {
+ @Deprecated public interface CompositionFrameClock extends androidx.compose.runtime.dispatch.MonotonicFrameClock {
method @Deprecated public default suspend <R> Object? awaitFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
@@ -337,12 +337,12 @@
ctor public Recomposer();
method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public androidx.compose.EmbeddingContext getEmbeddingContext();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
method public boolean hasPendingChanges();
method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<?> p);
method public void setEmbeddingContext(androidx.compose.EmbeddingContext p);
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
field public static final androidx.compose.Recomposer.Companion Companion;
}
diff --git a/compose/compose-runtime/api/restricted_0.1.0-dev16.txt b/compose/compose-runtime/api/restricted_0.1.0-dev16.txt
index 0548330..3252840 100644
--- a/compose/compose-runtime/api/restricted_0.1.0-dev16.txt
+++ b/compose/compose-runtime/api/restricted_0.1.0-dev16.txt
@@ -180,12 +180,12 @@
method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.dispatch.MonotonicFrameClock {
+ public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public CompositionCoroutineScope();
method @Deprecated public final suspend Object? awaitFrame(kotlin.coroutines.Continuation<? super java.lang.Long> p);
}
- @Deprecated public interface CompositionFrameClock extends androidx.compose.dispatch.MonotonicFrameClock {
+ @Deprecated public interface CompositionFrameClock extends androidx.compose.runtime.dispatch.MonotonicFrameClock {
method @Deprecated public default suspend <R> Object? awaitFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
@@ -368,12 +368,12 @@
ctor public Recomposer();
method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public androidx.compose.EmbeddingContext getEmbeddingContext();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
method public boolean hasPendingChanges();
method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<?> p);
method public void setEmbeddingContext(androidx.compose.EmbeddingContext p);
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
field public static final androidx.compose.Recomposer.Companion Companion;
}
diff --git a/compose/compose-runtime/api/restricted_current.txt b/compose/compose-runtime/api/restricted_current.txt
index 0548330..3252840 100644
--- a/compose/compose-runtime/api/restricted_current.txt
+++ b/compose/compose-runtime/api/restricted_current.txt
@@ -180,12 +180,12 @@
method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.dispatch.MonotonicFrameClock {
+ public abstract class CompositionCoroutineScope implements kotlinx.coroutines.CoroutineScope androidx.compose.runtime.dispatch.MonotonicFrameClock {
ctor public CompositionCoroutineScope();
method @Deprecated public final suspend Object? awaitFrame(kotlin.coroutines.Continuation<? super java.lang.Long> p);
}
- @Deprecated public interface CompositionFrameClock extends androidx.compose.dispatch.MonotonicFrameClock {
+ @Deprecated public interface CompositionFrameClock extends androidx.compose.runtime.dispatch.MonotonicFrameClock {
method @Deprecated public default suspend <R> Object? awaitFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R> p);
}
@@ -368,12 +368,12 @@
ctor public Recomposer();
method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public androidx.compose.EmbeddingContext getEmbeddingContext();
- method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
+ method public androidx.compose.runtime.dispatch.MonotonicFrameClock getFrameClock();
method public boolean hasPendingChanges();
method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<?> p);
method public void setEmbeddingContext(androidx.compose.EmbeddingContext p);
- property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
+ property public final androidx.compose.runtime.dispatch.MonotonicFrameClock frameClock;
field public static final androidx.compose.Recomposer.Companion Companion;
}
diff --git a/compose/compose-runtime/src/androidMain/kotlin/androidx/compose/ActualAndroid.kt b/compose/compose-runtime/src/androidMain/kotlin/androidx/compose/ActualAndroid.kt
index a5c02c8..a981c83 100644
--- a/compose/compose-runtime/src/androidMain/kotlin/androidx/compose/ActualAndroid.kt
+++ b/compose/compose-runtime/src/androidMain/kotlin/androidx/compose/ActualAndroid.kt
@@ -18,7 +18,7 @@
import android.os.Handler
import android.os.Looper
-import androidx.compose.dispatch.AndroidUiDispatcher
+import androidx.compose.runtime.dispatch.AndroidUiDispatcher
import kotlinx.coroutines.Dispatchers
import kotlin.coroutines.CoroutineContext
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/BroadcastFrameClock.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/BroadcastFrameClock.kt
index 7327e90..cdce77f 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/BroadcastFrameClock.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/BroadcastFrameClock.kt
@@ -16,7 +16,7 @@
package androidx.compose
-import androidx.compose.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlin.coroutines.Continuation
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/CompositionFrameClock.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/CompositionFrameClock.kt
index 58651a3..a0160f9 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/CompositionFrameClock.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/CompositionFrameClock.kt
@@ -17,8 +17,8 @@
// TODO(b/158105080): make part of ComposeRuntime
package androidx.compose
-import androidx.compose.dispatch.MonotonicFrameClock
-import androidx.compose.dispatch.withFrameMillis as withFrameMillisDispatch
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.withFrameMillis as withFrameMillisDispatch
/**
* Provides a time source for display frames for use in composition.
@@ -63,7 +63,7 @@
"CompositionFrameClock moved and renamed to MonotonicFrameClock",
ReplaceWith(
"withFrameMillis(onFrame)",
- "androidx.compose.dispatch.withFrameMillis"
+ "androidx.compose.runtime.dispatch.withFrameMillis"
)
)
@Suppress("UnnecessaryLambdaCreation", "DEPRECATION")
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt
index 2696ba4..9d7e6d1 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Recomposer.kt
@@ -20,8 +20,8 @@
)
package androidx.compose
-import androidx.compose.dispatch.DefaultMonotonicFrameClock
-import androidx.compose.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.DefaultMonotonicFrameClock
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
import androidx.compose.snapshots.Snapshot
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SuspendingEffects.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SuspendingEffects.kt
index e55b470d..d7374e6 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SuspendingEffects.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SuspendingEffects.kt
@@ -18,7 +18,7 @@
@file:OptIn(InternalComposeApi::class)
package androidx.compose
-import androidx.compose.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
diff --git a/compose/compose-runtime/src/desktopMain/kotlin/androidx/compose/ActualDesktop.kt b/compose/compose-runtime/src/desktopMain/kotlin/androidx/compose/ActualDesktop.kt
index 2afaf2d..2c88cf1 100644
--- a/compose/compose-runtime/src/desktopMain/kotlin/androidx/compose/ActualDesktop.kt
+++ b/compose/compose-runtime/src/desktopMain/kotlin/androidx/compose/ActualDesktop.kt
@@ -18,7 +18,7 @@
import javax.swing.SwingUtilities
import kotlin.coroutines.CoroutineContext
-import androidx.compose.dispatch.DesktopUiDispatcher
+import androidx.compose.runtime.dispatch.DesktopUiDispatcher
// API to allow override embedding context creation mechanism for tests.
var EmbeddingContextFactory: (() -> EmbeddingContext)? = null
diff --git a/compose/compose-runtime/src/test/kotlin/androidx/compose/CompositionTests.kt b/compose/compose-runtime/src/test/kotlin/androidx/compose/CompositionTests.kt
index 5baed73..4ed565d 100644
--- a/compose/compose-runtime/src/test/kotlin/androidx/compose/CompositionTests.kt
+++ b/compose/compose-runtime/src/test/kotlin/androidx/compose/CompositionTests.kt
@@ -17,7 +17,7 @@
@file:OptIn(ExperimentalComposeApi::class, InternalComposeApi::class)
package androidx.compose
-import androidx.compose.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
import androidx.compose.mock.Contact
import androidx.compose.mock.ContactModel
import androidx.compose.mock.MockComposeScope
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/ComposedModifierTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/ComposedModifierTest.kt
index 7aea2c6..cef557c 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/ComposedModifierTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/ComposedModifierTest.kt
@@ -24,7 +24,7 @@
import androidx.compose.Recomposer
import androidx.compose.SlotTable
import androidx.compose.currentComposer
-import androidx.compose.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
import androidx.compose.invalidate
import androidx.compose.remember
import androidx.compose.withRunningRecomposer
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
index 6b0e247..2b8188a 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
@@ -20,7 +20,7 @@
import androidx.compose.animation.core.rootAnimationClockFactory
import androidx.compose.InternalComposeApi
-import androidx.compose.dispatch.DesktopUiDispatcher
+import androidx.compose.runtime.dispatch.DesktopUiDispatcher
import androidx.ui.graphics.DesktopCanvas
import androidx.ui.graphics.DesktopImageShader
import androidx.ui.graphics.DesktopInternalCanvasHolder
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
index 3fe7f2d..115bf1c 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
@@ -16,7 +16,7 @@
package androidx.ui.desktop
import androidx.compose.animation.core.AnimationClockObserver
-import androidx.compose.dispatch.DesktopUiDispatcher
+import androidx.compose.runtime.dispatch.DesktopUiDispatcher
import androidx.ui.text.platform.paragraphActualFactory
import androidx.ui.text.platform.paragraphIntrinsicsActualFactory
import com.jogamp.opengl.GL
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt
index 39ff31e..bcdc970 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt
@@ -22,7 +22,7 @@
import androidx.compose.Composable
import androidx.compose.Providers
import androidx.compose.Recomposer
-import androidx.compose.dispatch.DesktopUiDispatcher
+import androidx.compose.runtime.dispatch.DesktopUiDispatcher
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LifecycleRegistry
diff --git a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt
index 4296c69..d2d3a09 100644
--- a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt
+++ b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt
@@ -42,7 +42,7 @@
override fun visitFile(node: UFile) {
val packageName = node.packageName
- PackageNameMigrationMap.keys.find { it.contains(packageName) }?.let {
+ PackageNameMigrationMap.keys.find { packageName.contains(it) }?.let {
val newPackageName = PackageNameMigrationMap[it]
context.report(
ISSUE,
@@ -66,7 +66,8 @@
"androidx.ui.foundation" to "androidx.compose.foundation",
"androidx.ui.layout" to "androidx.compose.foundation.layout",
"androidx.animation" to "androidx.compose.animation.core",
- "androidx.ui.animation" to "androidx.compose.animation"
+ "androidx.ui.animation" to "androidx.compose.animation",
+ "androidx.compose.dispatch" to "androidx.compose.runtime.dispatch"
)
val ISSUE = Issue.create(
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestCaseRunner.kt b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestCaseRunner.kt
index 0abb9eb..7e5dcde 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestCaseRunner.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestCaseRunner.kt
@@ -32,7 +32,7 @@
import androidx.compose.Composition
import androidx.compose.ExperimentalComposeApi
import androidx.compose.Recomposer
-import androidx.compose.dispatch.MonotonicFrameClock
+import androidx.compose.runtime.dispatch.MonotonicFrameClock
import androidx.compose.snapshots.Snapshot
import androidx.ui.core.AndroidOwner
import androidx.ui.core.setContent
