Skip to content

Commit 6de934e

Browse files
NatebelayGerrit Code Review
Natebelay
authored and
Gerrit Code Review
committed
Merge "Update versions for release id 1681923600000" into androidx-main
2 parents c4b6d61 + 809bce6 commit 6de934e

File tree

101 files changed

+7869
-62
lines changed

Some content is hidden

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

101 files changed

+7869
-62
lines changed

‎compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class VersionChecker(val context: IrPluginContext) {
112112
9701 to "1.5.0-alpha01",
113113
9801 to "1.5.0-alpha02",
114114
9901 to "1.5.0-alpha03",
115+
10001 to "1.5.0-alpha04",
115116
)
116117

117118
/**
@@ -124,7 +125,7 @@ class VersionChecker(val context: IrPluginContext) {
124125
* The maven version string of this compiler. This string should be updated before/after every
125126
* release.
126127
*/
127-
const val compilerVersion: String = "1.4.6"
128+
const val compilerVersion: String = "1.5.0-alpha04"
128129
private val minimumRuntimeVersion: String
129130
get() = runtimeVersionToMavenVersionTable[minimumRuntimeVersionInt] ?: "unknown"
130131
}

‎compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/ComposeVersion.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ internal object ComposeVersion {
2828
* IMPORTANT: Whenever updating this value, please make sure to also update `versionTable` and
2929
* `minimumRuntimeVersionInt` in `VersionChecker.kt` of the compiler.
3030
*/
31-
const val version: Int = 9901
31+
const val version: Int = 10001
3232
}

‎emoji2/emoji2-bundled/api/1.4.0-beta03.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Signature format: 4.0
2+
package androidx.emoji2.bundled {
3+
4+
public class BundledEmojiCompatConfig extends androidx.emoji2.text.EmojiCompat.Config {
5+
ctor public BundledEmojiCompatConfig(android.content.Context);
6+
}
7+
8+
}
9+

‎emoji2/emoji2-bundled/api/public_plus_experimental_1.4.0-beta03.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Signature format: 4.0
2+
package androidx.emoji2.bundled {
3+
4+
public class BundledEmojiCompatConfig extends androidx.emoji2.text.EmojiCompat.Config {
5+
ctor public BundledEmojiCompatConfig(android.content.Context);
6+
}
7+
8+
}
9+

‎emoji2/emoji2-bundled/api/res-1.4.0-beta03.txt‎

Whitespace-only changes.

‎emoji2/emoji2-bundled/api/restricted_1.4.0-beta03.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Signature format: 4.0
2+
package androidx.emoji2.bundled {
3+
4+
public class BundledEmojiCompatConfig extends androidx.emoji2.text.EmojiCompat.Config {
5+
ctor public BundledEmojiCompatConfig(android.content.Context);
6+
}
7+
8+
}
9+

‎emoji2/emoji2-emojipicker/api/1.4.0-beta03.txt‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Signature format: 4.0
2+
package androidx.emoji2.emojipicker {
3+
4+
public final class EmojiPickerView extends android.widget.FrameLayout {
5+
ctor public EmojiPickerView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
6+
ctor public EmojiPickerView(android.content.Context context, optional android.util.AttributeSet? attrs);
7+
ctor public EmojiPickerView(android.content.Context context);
8+
method public int getEmojiGridColumns();
9+
method public float getEmojiGridRows();
10+
method public void setEmojiGridColumns(int);
11+
method public void setEmojiGridRows(float);
12+
method public void setOnEmojiPickedListener(androidx.core.util.Consumer<androidx.emoji2.emojipicker.EmojiViewItem>? onEmojiPickedListener);
13+
method public void setRecentEmojiProvider(androidx.emoji2.emojipicker.RecentEmojiProvider recentEmojiProvider);
14+
property public final int emojiGridColumns;
15+
property public final float emojiGridRows;
16+
}
17+
18+
public final class EmojiViewItem {
19+
ctor public EmojiViewItem(String emoji, java.util.List<java.lang.String> variants);
20+
method public String getEmoji();
21+
method public java.util.List<java.lang.String> getVariants();
22+
property public final String emoji;
23+
property public final java.util.List<java.lang.String> variants;
24+
}
25+
26+
public interface RecentEmojiAsyncProvider {
27+
method public com.google.common.util.concurrent.ListenableFuture<java.util.List<java.lang.String>> getRecentEmojiListAsync();
28+
method public void recordSelection(String emoji);
29+
}
30+
31+
public interface RecentEmojiProvider {
32+
method public suspend Object? getRecentEmojiList(kotlin.coroutines.Continuation<? super java.util.List<? extends java.lang.String>>);
33+
method public void recordSelection(String emoji);
34+
}
35+
36+
public final class RecentEmojiProviderAdapter implements androidx.emoji2.emojipicker.RecentEmojiProvider {
37+
ctor public RecentEmojiProviderAdapter(androidx.emoji2.emojipicker.RecentEmojiAsyncProvider recentEmojiAsyncProvider);
38+
method public suspend Object? getRecentEmojiList(kotlin.coroutines.Continuation<? super java.util.List<? extends java.lang.String>>);
39+
method public void recordSelection(String emoji);
40+
}
41+
42+
}
43+

‎emoji2/emoji2-emojipicker/api/public_plus_experimental_1.4.0-beta03.txt‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Signature format: 4.0
2+
package androidx.emoji2.emojipicker {
3+
4+
public final class EmojiPickerView extends android.widget.FrameLayout {
5+
ctor public EmojiPickerView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
6+
ctor public EmojiPickerView(android.content.Context context, optional android.util.AttributeSet? attrs);
7+
ctor public EmojiPickerView(android.content.Context context);
8+
method public int getEmojiGridColumns();
9+
method public float getEmojiGridRows();
10+
method public void setEmojiGridColumns(int);
11+
method public void setEmojiGridRows(float);
12+
method public void setOnEmojiPickedListener(androidx.core.util.Consumer<androidx.emoji2.emojipicker.EmojiViewItem>? onEmojiPickedListener);
13+
method public void setRecentEmojiProvider(androidx.emoji2.emojipicker.RecentEmojiProvider recentEmojiProvider);
14+
property public final int emojiGridColumns;
15+
property public final float emojiGridRows;
16+
}
17+
18+
public final class EmojiViewItem {
19+
ctor public EmojiViewItem(String emoji, java.util.List<java.lang.String> variants);
20+
method public String getEmoji();
21+
method public java.util.List<java.lang.String> getVariants();
22+
property public final String emoji;
23+
property public final java.util.List<java.lang.String> variants;
24+
}
25+
26+
public interface RecentEmojiAsyncProvider {
27+
method public com.google.common.util.concurrent.ListenableFuture<java.util.List<java.lang.String>> getRecentEmojiListAsync();
28+
method public void recordSelection(String emoji);
29+
}
30+
31+
public interface RecentEmojiProvider {
32+
method public suspend Object? getRecentEmojiList(kotlin.coroutines.Continuation<? super java.util.List<? extends java.lang.String>>);
33+
method public void recordSelection(String emoji);
34+
}
35+
36+
public final class RecentEmojiProviderAdapter implements androidx.emoji2.emojipicker.RecentEmojiProvider {
37+
ctor public RecentEmojiProviderAdapter(androidx.emoji2.emojipicker.RecentEmojiAsyncProvider recentEmojiAsyncProvider);
38+
method public suspend Object? getRecentEmojiList(kotlin.coroutines.Continuation<? super java.util.List<? extends java.lang.String>>);
39+
method public void recordSelection(String emoji);
40+
}
41+
42+
}
43+

‎emoji2/emoji2-emojipicker/api/res-1.4.0-beta03.txt‎

Whitespace-only changes.

‎emoji2/emoji2-emojipicker/api/restricted_1.4.0-beta03.txt‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Signature format: 4.0
2+
package androidx.emoji2.emojipicker {
3+
4+
public final class EmojiPickerView extends android.widget.FrameLayout {
5+
ctor public EmojiPickerView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
6+
ctor public EmojiPickerView(android.content.Context context, optional android.util.AttributeSet? attrs);
7+
ctor public EmojiPickerView(android.content.Context context);
8+
method public int getEmojiGridColumns();
9+
method public float getEmojiGridRows();
10+
method public void setEmojiGridColumns(int);
11+
method public void setEmojiGridRows(float);
12+
method public void setOnEmojiPickedListener(androidx.core.util.Consumer<androidx.emoji2.emojipicker.EmojiViewItem>? onEmojiPickedListener);
13+
method public void setRecentEmojiProvider(androidx.emoji2.emojipicker.RecentEmojiProvider recentEmojiProvider);
14+
property public final int emojiGridColumns;
15+
property public final float emojiGridRows;
16+
}
17+
18+
public final class EmojiViewItem {
19+
ctor public EmojiViewItem(String emoji, java.util.List<java.lang.String> variants);
20+
method public String getEmoji();
21+
method public java.util.List<java.lang.String> getVariants();
22+
property public final String emoji;
23+
property public final java.util.List<java.lang.String> variants;
24+
}
25+
26+
public interface RecentEmojiAsyncProvider {
27+
method public com.google.common.util.concurrent.ListenableFuture<java.util.List<java.lang.String>> getRecentEmojiListAsync();
28+
method public void recordSelection(String emoji);
29+
}
30+
31+
public interface RecentEmojiProvider {
32+
method public suspend Object? getRecentEmojiList(kotlin.coroutines.Continuation<? super java.util.List<? extends java.lang.String>>);
33+
method public void recordSelection(String emoji);
34+
}
35+
36+
public final class RecentEmojiProviderAdapter implements androidx.emoji2.emojipicker.RecentEmojiProvider {
37+
ctor public RecentEmojiProviderAdapter(androidx.emoji2.emojipicker.RecentEmojiAsyncProvider recentEmojiAsyncProvider);
38+
method public suspend Object? getRecentEmojiList(kotlin.coroutines.Continuation<? super java.util.List<? extends java.lang.String>>);
39+
method public void recordSelection(String emoji);
40+
}
41+
42+
}
43+

0 commit comments

Comments
 (0)