Skip to content

Commit 589f187

Browse files
authored
Merge pull request #1183 from mikepenz/feature/fix_conflict
Fix conflicting overloads
2 parents a993318 + 6ec156f commit 589f187

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

aboutlibraries-compose/api/android/aboutlibraries-compose.api

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public final class com/mikepenz/aboutlibraries/ui/compose/ExtensionsKt {
3838
public static final fun rememberLibraries ([BLandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
3939
}
4040

41-
public final class com/mikepenz/aboutlibraries/ui/compose/Extensions_androidKt {
42-
public static final fun rememberLibraries (ILandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
43-
public static final fun rememberLibraries (Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;
44-
}
45-
4641
public final class com/mikepenz/aboutlibraries/ui/compose/LibrariesScaffoldKt {
4742
public static final fun LibrariesScaffold (Lkotlinx/collections/immutable/ImmutableList;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/lazy/LazyListState;Landroidx/compose/foundation/layout/PaddingValues;Lcom/mikepenz/aboutlibraries/ui/compose/LibraryPadding;Lcom/mikepenz/aboutlibraries/ui/compose/LibraryDimensions;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V
4843
}
@@ -101,6 +96,11 @@ public abstract interface class com/mikepenz/aboutlibraries/ui/compose/LibraryTe
10196
public abstract fun getVersionTextStyle ()Landroidx/compose/ui/text/TextStyle;
10297
}
10398

99+
public final class com/mikepenz/aboutlibraries/ui/compose/android/Extensions_androidKt {
100+
public static final fun rememberLibraries (ILandroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State;
101+
public static final fun rememberLibraries (Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/State;
102+
}
103+
104104
public final class com/mikepenz/aboutlibraries/ui/compose/layout/LibraryScaffoldKt {
105105
public static final fun LibraryScaffoldLayout (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/Modifier;Lcom/mikepenz/aboutlibraries/ui/compose/LibraryPadding;Landroidx/compose/runtime/Composer;II)V
106106
}

aboutlibraries-compose/src/androidMain/kotlin/com/mikepenz/aboutlibraries/ui/compose/Extensions.android.kt renamed to aboutlibraries-compose/src/androidMain/kotlin/com/mikepenz/aboutlibraries/ui/compose/android/Extensions.android.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mikepenz.aboutlibraries.ui.compose
1+
package com.mikepenz.aboutlibraries.ui.compose.android
22

33
import android.content.Context
44
import androidx.annotation.RawRes

app/src/androidMain/kotlin/com/mikepenz/aboutlibraries/sample/ComposeActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ import com.mikepenz.aboutlibraries.LibsBuilder
7575
import com.mikepenz.aboutlibraries.LibsConfiguration
7676
import com.mikepenz.aboutlibraries.entity.Library
7777
import com.mikepenz.aboutlibraries.sample.icons.Github
78+
import com.mikepenz.aboutlibraries.ui.compose.android.rememberLibraries
7879
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
79-
import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries
8080
import com.mikepenz.aboutlibraries.util.SpecialButton
8181
import kotlinx.coroutines.launch
8282

0 commit comments

Comments
 (0)