Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -845,9 +845,8 @@ class AndroidXImplPlugin @Inject constructor(val componentFactory: SoftwareCompo
//
// Fixes problem when instrumented tests compilation is not properly applied to
// the framework configuration.
it.linkTaskProvider.configure {
@Suppress("DEPRECATION")
it.kotlinOptions.freeCompilerArgs += "-Xallocator=std"
it.compilation.compileTaskProvider.configure {
it.compilerOptions.freeCompilerArgs.add("-Xallocator=std")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,10 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
//
// Fixes problem when instrumented tests compilation is not properly applied to
// the framework configuration.
it.linkTaskProvider.configure {
@Suppress("DEPRECATION")
it.kotlinOptions.freeCompilerArgs += flags
it.compilation.compileTaskProvider.configure {
it.compilerOptions {
freeCompilerArgs.addAll(flags)
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions compose/foundation/foundation/api/desktop/foundation.api
Original file line number Diff line number Diff line change
Expand Up @@ -1017,14 +1017,14 @@ public abstract interface class androidx/compose/foundation/lazy/LazyListScope {

public final class androidx/compose/foundation/lazy/LazyListScope$DefaultImpls {
public static fun item (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
public static synthetic fun item (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
public static fun item (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
public static synthetic fun item$default (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
public static synthetic fun item$default (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
public static fun items (Landroidx/compose/foundation/lazy/LazyListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;)V
public static synthetic fun items (Landroidx/compose/foundation/lazy/LazyListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;)V
public static fun items (Landroidx/compose/foundation/lazy/LazyListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;)V
public static synthetic fun items$default (Landroidx/compose/foundation/lazy/LazyListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)V
public static synthetic fun items$default (Landroidx/compose/foundation/lazy/LazyListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)V
public static synthetic fun stickyHeader (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
public static fun stickyHeader (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V
public static fun stickyHeader (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function4;)V
public static synthetic fun stickyHeader$default (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
public static synthetic fun stickyHeader$default (Landroidx/compose/foundation/lazy/LazyListScope;Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)V
Expand Down
10 changes: 10 additions & 0 deletions compose/ui/ui/api/ui.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -4513,6 +4513,10 @@ final class androidx.compose.ui.main/DefaultIOSAppDelegate : platform.UIKit/UIAp
final fun <get-window>(): platform.UIKit/UIWindow? // androidx.compose.ui.main/DefaultIOSAppDelegate.window.<get-window>|objc:window#Accessor[0]
final fun <set-window>(platform.UIKit/UIWindow?) // androidx.compose.ui.main/DefaultIOSAppDelegate.window.<set-window>|objc:setWindow:#Accessor[0]

final fun alignCenter(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.alignCenter|objc:alignCenter:[0]
final fun alignJustified(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.alignJustified|objc:alignJustified:[0]
final fun alignLeft(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.alignLeft|objc:alignLeft:[0]
final fun alignRight(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.alignRight|objc:alignRight:[0]
final fun application(platform.UIKit/UIApplication, kotlin.collections/List<*>, platform.Foundation/NSCoder): platform.UIKit/UIViewController? // androidx.compose.ui.main/DefaultIOSAppDelegate.application|objc:application:viewControllerWithRestorationIdentifierPath:coder:[0]
final fun application(platform.UIKit/UIApplication, kotlin.collections/Map<kotlin/Any?, *>) // androidx.compose.ui.main/DefaultIOSAppDelegate.application|objc:application:didReceiveRemoteNotification:[0]
final fun application(platform.UIKit/UIApplication, kotlin.collections/Map<kotlin/Any?, *>, kotlin/Function1<platform.UIKit/UIBackgroundFetchResult, kotlin/Unit>) // androidx.compose.ui.main/DefaultIOSAppDelegate.application|objc:application:didReceiveRemoteNotification:fetchCompletionHandler:[0]
Expand Down Expand Up @@ -4610,11 +4614,13 @@ final class androidx.compose.ui.main/DefaultIOSAppDelegate : platform.UIKit/UIAp
final fun motionEnded(kotlin/Long, platform.UIKit/UIEvent?) // androidx.compose.ui.main/DefaultIOSAppDelegate.motionEnded|objc:motionEnded:withEvent:[0]
final fun move(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.move|objc:move:[0]
final fun mutableCopy(): kotlin/Any? // androidx.compose.ui.main/DefaultIOSAppDelegate.mutableCopy|objc:mutableCopy[0]
final fun newFromPasteboard(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.newFromPasteboard|objc:newFromPasteboard:[0]
final fun nextResponder(): platform.UIKit/UIResponder? // androidx.compose.ui.main/DefaultIOSAppDelegate.nextResponder|objc:nextResponder[0]
final fun paste(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.paste|objc:paste:[0]
final fun pasteAndGo(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.pasteAndGo|objc:pasteAndGo:[0]
final fun pasteAndMatchStyle(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.pasteAndMatchStyle|objc:pasteAndMatchStyle:[0]
final fun pasteAndSearch(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.pasteAndSearch|objc:pasteAndSearch:[0]
final fun performClose(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.performClose|objc:performClose:[0]
final fun performSelector(kotlinx.cinterop/CPointer<out kotlinx.cinterop/CPointed>?): kotlin/Any? // androidx.compose.ui.main/DefaultIOSAppDelegate.performSelector|objc:performSelector:[0]
final fun performSelector(kotlinx.cinterop/CPointer<out kotlinx.cinterop/CPointed>?, kotlin/Any?): kotlin/Any? // androidx.compose.ui.main/DefaultIOSAppDelegate.performSelector|objc:performSelector:withObject:[0]
final fun performSelector(kotlinx.cinterop/CPointer<out kotlinx.cinterop/CPointed>?, kotlin/Any?, kotlin/Any?): kotlin/Any? // androidx.compose.ui.main/DefaultIOSAppDelegate.performSelector|objc:performSelector:withObject:withObject:[0]
Expand All @@ -4623,18 +4629,22 @@ final class androidx.compose.ui.main/DefaultIOSAppDelegate : platform.UIKit/UIAp
final fun pressesChanged(kotlin.collections/Set<*>, platform.UIKit/UIPressesEvent?) // androidx.compose.ui.main/DefaultIOSAppDelegate.pressesChanged|objc:pressesChanged:withEvent:[0]
final fun pressesEnded(kotlin.collections/Set<*>, platform.UIKit/UIPressesEvent?) // androidx.compose.ui.main/DefaultIOSAppDelegate.pressesEnded|objc:pressesEnded:withEvent:[0]
final fun print(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.print|objc:print:[0]
final fun providerForDeferredMenuElement(platform.UIKit/UIDeferredMenuElement): platform.UIKit/UIDeferredMenuElementProvider? // androidx.compose.ui.main/DefaultIOSAppDelegate.providerForDeferredMenuElement|objc:providerForDeferredMenuElement:[0]
final fun remoteControlReceivedWithEvent(platform.UIKit/UIEvent?) // androidx.compose.ui.main/DefaultIOSAppDelegate.remoteControlReceivedWithEvent|objc:remoteControlReceivedWithEvent:[0]
final fun rename(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.rename|objc:rename:[0]
final fun resignFirstResponder(): kotlin/Boolean // androidx.compose.ui.main/DefaultIOSAppDelegate.resignFirstResponder|objc:resignFirstResponder[0]
final fun respondsToSelector(kotlinx.cinterop/CPointer<out kotlinx.cinterop/CPointed>?): kotlin/Boolean // androidx.compose.ui.main/DefaultIOSAppDelegate.respondsToSelector|objc:respondsToSelector:[0]
final fun select(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.select|objc:select:[0]
final fun selectAll(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.selectAll|objc:selectAll:[0]
final fun setWindow(platform.UIKit/UIWindow?) // androidx.compose.ui.main/DefaultIOSAppDelegate.setWindow|objc:setWindow:[0]
final fun showWritingTools(kotlin/Any) // androidx.compose.ui.main/DefaultIOSAppDelegate.showWritingTools|objc:showWritingTools:[0]
final fun superclass(): kotlinx.cinterop/ObjCClass? // androidx.compose.ui.main/DefaultIOSAppDelegate.superclass|objc:superclass[0]
final fun targetForAction(kotlinx.cinterop/CPointer<out kotlinx.cinterop/CPointed>?, kotlin/Any?): kotlin/Any? // androidx.compose.ui.main/DefaultIOSAppDelegate.targetForAction|objc:targetForAction:withSender:[0]
final fun toString(): kotlin/String // androidx.compose.ui.main/DefaultIOSAppDelegate.toString|toString(){}[0]
final fun toggleBoldface(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.toggleBoldface|objc:toggleBoldface:[0]
final fun toggleInspector(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.toggleInspector|objc:toggleInspector:[0]
final fun toggleItalics(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.toggleItalics|objc:toggleItalics:[0]
final fun toggleSidebar(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.toggleSidebar|objc:toggleSidebar:[0]
final fun toggleUnderline(kotlin/Any?) // androidx.compose.ui.main/DefaultIOSAppDelegate.toggleUnderline|objc:toggleUnderline:[0]
final fun touchesBegan(kotlin.collections/Set<*>, platform.UIKit/UIEvent?) // androidx.compose.ui.main/DefaultIOSAppDelegate.touchesBegan|objc:touchesBegan:withEvent:[0]
final fun touchesCancelled(kotlin.collections/Set<*>, platform.UIKit/UIEvent?) // androidx.compose.ui.main/DefaultIOSAppDelegate.touchesCancelled|objc:touchesCancelled:withEvent:[0]
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ hilt = "2.49"
incap = "0.2"
javaxInject = "1"
jcodec = "0.2.5"
kotlin = "2.2.20"
kotlin = "2.3.0-Beta2"
kotlinBenchmark = "0.4.11"
kotlinComposeCompiler = "2.2.20"
kotlinGradlePluginAnnotations = "2.2.20"
kotlinGradlePluginApi = "2.2.20"
kotlinComposeCompiler = "2.3.0-Beta2"
kotlinGradlePluginAnnotations = "2.3.0-Beta2"
kotlinGradlePluginApi = "2.3.0-Beta2"
kotlinCompileTesting = "1.4.9"
kotlinCoroutines = "1.8.0"
kotlinNativeUtils = "2.2.20"
kotlinNativeUtils = "2.3.0-Beta2"
kotlinSerialization = "1.7.3"
kotlinToolingCore = "2.2.20"
kotlinToolingCore = "2.3.0-Beta2"
ksp = "2.2.20-2.0.4"
ktlint = "0.46.0"
ktfmt = "0.50"
Expand Down
Loading