diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts index b51716ae..b5249ba1 100644 --- a/sample/android/build.gradle.kts +++ b/sample/android/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("com.mikepenz.convention.kotlin") id("com.mikepenz.convention.compose") id("com.mikepenz.aboutlibraries.plugin") + id("com.mikepenz.aboutlibraries.plugin.android") alias(baseLibs.plugins.screenshot) } diff --git a/sample/desktop/src/jvmMain/kotlin/com/mikepenz/markdown/main.kt b/sample/desktop/src/jvmMain/kotlin/com/mikepenz/markdown/main.kt index 8d01a7f3..0432476f 100644 --- a/sample/desktop/src/jvmMain/kotlin/com/mikepenz/markdown/main.kt +++ b/sample/desktop/src/jvmMain/kotlin/com/mikepenz/markdown/main.kt @@ -3,15 +3,13 @@ package com.mikepenz.markdown import androidx.compose.runtime.getValue import androidx.compose.ui.window.Window import androidx.compose.ui.window.application -import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries +import com.mikepenz.aboutlibraries.ui.compose.produceLibraries import com.mikepenz.markdown.sample.App import com.mikepenz.markdown.sample.desktop.resources.Res -import org.jetbrains.compose.resources.ExperimentalResourceApi -@OptIn(ExperimentalResourceApi::class) fun main() = application { Window(onCloseRequest = ::exitApplication, title = "Markdown Sample") { - val libraries by rememberLibraries { + val libraries by produceLibraries { Res.readBytes("files/aboutlibraries.json").decodeToString() } App(libraries) diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts index 02d57e8e..860cc378 100644 --- a/sample/shared/build.gradle.kts +++ b/sample/shared/build.gradle.kts @@ -58,9 +58,6 @@ compose.resources { } aboutLibraries { - android { - registerAndroidTasks = false - } export { outputPath = file("src/commonMain/composeResources/files/aboutlibraries.json") } diff --git a/sample/shared/src/iosMain/kotlin/com/mikepenz/markdown/MainViewController.kt b/sample/shared/src/iosMain/kotlin/com/mikepenz/markdown/MainViewController.kt index 93edd71d..45f0ad4b 100644 --- a/sample/shared/src/iosMain/kotlin/com/mikepenz/markdown/MainViewController.kt +++ b/sample/shared/src/iosMain/kotlin/com/mikepenz/markdown/MainViewController.kt @@ -2,14 +2,12 @@ package com.mikepenz.markdown import androidx.compose.runtime.getValue import androidx.compose.ui.window.ComposeUIViewController -import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries +import com.mikepenz.aboutlibraries.ui.compose.produceLibraries import com.mikepenz.markdown.sample.App import com.mikepenz.markdown.sample.shared.resources.Res -import org.jetbrains.compose.resources.ExperimentalResourceApi -@OptIn(ExperimentalResourceApi::class) fun MainViewController() = ComposeUIViewController { - val libraries by rememberLibraries { + val libraries by produceLibraries { Res.readBytes("files/aboutlibraries.json").decodeToString() } App(libraries = libraries) diff --git a/sample/web/src/commonMain/kotlin/com/mikepenz/markdown/Main.kt b/sample/web/src/commonMain/kotlin/com/mikepenz/markdown/Main.kt index b0bb7b8c..9f500c75 100644 --- a/sample/web/src/commonMain/kotlin/com/mikepenz/markdown/Main.kt +++ b/sample/web/src/commonMain/kotlin/com/mikepenz/markdown/Main.kt @@ -3,15 +3,14 @@ package com.mikepenz.markdown import androidx.compose.runtime.getValue import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.window.ComposeViewport -import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries +import com.mikepenz.aboutlibraries.ui.compose.produceLibraries import com.mikepenz.markdown.sample.App import com.mikepenz.markdown.sample.web.resources.Res -import org.jetbrains.compose.resources.ExperimentalResourceApi -@OptIn(ExperimentalComposeUiApi::class, ExperimentalResourceApi::class) +@OptIn(ExperimentalComposeUiApi::class) fun main() { ComposeViewport { - val libraries by rememberLibraries { + val libraries by produceLibraries { Res.readBytes("files/aboutlibraries.json").decodeToString() } App(libraries)