Skip to content

Commit 345bc70

Browse files
NatebelayNatebelay
committedMar 27, 2023
Update versions
Test: na Merged-In: I542500b5202fe697661dcf02baaabf23a62ea124 Change-Id: I0ab7864bcb85f8724997c079a0a3ede9f604c6f0
1 parent 9c2ba51 commit 345bc70

File tree

35 files changed

+4635
-29
lines changed

35 files changed

+4635
-29
lines changed
 

‎benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoSdkHandshakeTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import org.junit.runner.RunWith
4747
import org.junit.runners.Parameterized
4848
import org.junit.runners.Parameterized.Parameters
4949

50-
private const val tracingPerfettoVersion = "1.0.0-alpha13" // TODO(224510255): get by 'reflection'
50+
private const val tracingPerfettoVersion = "1.0.0-alpha14" // TODO(224510255): get by 'reflection'
5151
private const val minSupportedSdk = Build.VERSION_CODES.R // TODO(234351579): Support API < 30
5252

5353
@RunWith(Parameterized::class)

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ class VersionChecker(val context: IrPluginContext) {
110110
9700 to "1.4.0-rc01",
111111
9701 to "1.4.0-rc02",
112112
9701 to "1.5.0-alpha01",
113+
9801 to "1.5.0-alpha02",
113114
)
114115

115116
/**
@@ -122,7 +123,7 @@ class VersionChecker(val context: IrPluginContext) {
122123
* The maven version string of this compiler. This string should be updated before/after every
123124
* release.
124125
*/
125-
const val compilerVersion: String = "1.4.4"
126+
const val compilerVersion: String = "1.5.0-alpha02"
126127
private val minimumRuntimeVersion: String
127128
get() = runtimeVersionToMavenVersionTable[minimumRuntimeVersionInt] ?: "unknown"
128129
}

‎compose/material3/material3-window-size-class/api/1.1.0-beta02.txt

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Signature format: 4.0
2+
package androidx.compose.material3.windowsizeclass {
3+
4+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
5+
method public operator int compareTo(int other);
6+
field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
7+
}
8+
9+
public static final class WindowHeightSizeClass.Companion {
10+
method public int getCompact();
11+
method public int getExpanded();
12+
method public int getMedium();
13+
property public final int Compact;
14+
property public final int Expanded;
15+
property public final int Medium;
16+
}
17+
18+
@androidx.compose.runtime.Immutable public final class WindowSizeClass {
19+
method public int getHeightSizeClass();
20+
method public int getWidthSizeClass();
21+
property public final int heightSizeClass;
22+
property public final int widthSizeClass;
23+
field public static final androidx.compose.material3.windowsizeclass.WindowSizeClass.Companion Companion;
24+
}
25+
26+
public static final class WindowSizeClass.Companion {
27+
}
28+
29+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowWidthSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> {
30+
method public operator int compareTo(int other);
31+
field public static final androidx.compose.material3.windowsizeclass.WindowWidthSizeClass.Companion Companion;
32+
}
33+
34+
public static final class WindowWidthSizeClass.Companion {
35+
method public int getCompact();
36+
method public int getExpanded();
37+
method public int getMedium();
38+
property public final int Compact;
39+
property public final int Expanded;
40+
property public final int Medium;
41+
}
42+
43+
}
44+

‎compose/material3/material3-window-size-class/api/public_plus_experimental_1.1.0-beta02.txt

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Signature format: 4.0
2+
package androidx.compose.material3.windowsizeclass {
3+
4+
public final class AndroidWindowSizeClass_androidKt {
5+
method @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi @androidx.compose.runtime.Composable public static androidx.compose.material3.windowsizeclass.WindowSizeClass calculateWindowSizeClass(android.app.Activity activity);
6+
}
7+
8+
@kotlin.RequiresOptIn(message="This material3-window-size-class API is experimental and is likely to change or to " + "be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3WindowSizeClassApi {
9+
}
10+
11+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
12+
method public operator int compareTo(int other);
13+
field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
14+
}
15+
16+
public static final class WindowHeightSizeClass.Companion {
17+
method public int getCompact();
18+
method public int getExpanded();
19+
method public int getMedium();
20+
property public final int Compact;
21+
property public final int Expanded;
22+
property public final int Medium;
23+
}
24+
25+
@androidx.compose.runtime.Immutable public final class WindowSizeClass {
26+
method public int getHeightSizeClass();
27+
method public int getWidthSizeClass();
28+
property public final int heightSizeClass;
29+
property public final int widthSizeClass;
30+
field public static final androidx.compose.material3.windowsizeclass.WindowSizeClass.Companion Companion;
31+
}
32+
33+
public static final class WindowSizeClass.Companion {
34+
method @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi @org.jetbrains.annotations.TestOnly public androidx.compose.material3.windowsizeclass.WindowSizeClass calculateFromSize(long size);
35+
}
36+
37+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowWidthSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> {
38+
method public operator int compareTo(int other);
39+
field public static final androidx.compose.material3.windowsizeclass.WindowWidthSizeClass.Companion Companion;
40+
}
41+
42+
public static final class WindowWidthSizeClass.Companion {
43+
method public int getCompact();
44+
method public int getExpanded();
45+
method public int getMedium();
46+
property public final int Compact;
47+
property public final int Expanded;
48+
property public final int Medium;
49+
}
50+
51+
}
52+

‎compose/material3/material3-window-size-class/api/res-1.1.0-beta02.txt

Whitespace-only changes.

‎compose/material3/material3-window-size-class/api/restricted_1.1.0-beta02.txt

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Signature format: 4.0
2+
package androidx.compose.material3.windowsizeclass {
3+
4+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
5+
method public operator int compareTo(int other);
6+
field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
7+
}
8+
9+
public static final class WindowHeightSizeClass.Companion {
10+
method public int getCompact();
11+
method public int getExpanded();
12+
method public int getMedium();
13+
property public final int Compact;
14+
property public final int Expanded;
15+
property public final int Medium;
16+
}
17+
18+
@androidx.compose.runtime.Immutable public final class WindowSizeClass {
19+
method public int getHeightSizeClass();
20+
method public int getWidthSizeClass();
21+
property public final int heightSizeClass;
22+
property public final int widthSizeClass;
23+
field public static final androidx.compose.material3.windowsizeclass.WindowSizeClass.Companion Companion;
24+
}
25+
26+
public static final class WindowSizeClass.Companion {
27+
}
28+
29+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowWidthSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> {
30+
method public operator int compareTo(int other);
31+
field public static final androidx.compose.material3.windowsizeclass.WindowWidthSizeClass.Companion Companion;
32+
}
33+
34+
public static final class WindowWidthSizeClass.Companion {
35+
method public int getCompact();
36+
method public int getExpanded();
37+
method public int getMedium();
38+
property public final int Compact;
39+
property public final int Expanded;
40+
property public final int Medium;
41+
}
42+
43+
}
44+

0 commit comments

Comments
 (0)
Please sign in to comment.