From c773f0f36894d7c9e5237777c5dd144eeb678674 Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Sun, 20 Aug 2023 23:39:18 +0300 Subject: [PATCH 01/10] Update gradle to v8.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 357d821..e61af4f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip From a7eaa607daedd50d202a968f005aeb41ff6fda8a Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Sun, 20 Aug 2023 23:40:16 +0300 Subject: [PATCH 02/10] Update spotless to v6.20.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0462e7..3017897 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # Plugins agp = "8.0.2" dokka = "1.8.20" -spotless = "6.19.0" +spotless = "6.20.0" mavenPublish = "0.25.2" bcv = "0.13.2" gver = "0.47.0" From bbe09b88cf336db640d73ac7c937c92e7e9011d3 Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Sun, 20 Aug 2023 23:42:24 +0300 Subject: [PATCH 03/10] Update agp to v8.1.0 --- .../ru/ldralighieri/composites/CommonExtension+kotlinOptions.kt | 2 +- .../ldralighieri/composites/Project+configureAndroidCompose.kt | 2 +- .../ldralighieri/composites/Project+configureKotlinAndroid.kt | 2 +- gradle/libs.versions.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/CommonExtension+kotlinOptions.kt b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/CommonExtension+kotlinOptions.kt index 65fb9e5..b6aa4d7 100644 --- a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/CommonExtension+kotlinOptions.kt +++ b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/CommonExtension+kotlinOptions.kt @@ -20,6 +20,6 @@ import com.android.build.api.dsl.CommonExtension import org.gradle.api.plugins.ExtensionAware import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions -internal fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { +internal fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { (this as ExtensionAware).extensions.configure("kotlinOptions", block) } diff --git a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt index 8727962..6ef8e94 100644 --- a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt @@ -23,7 +23,7 @@ import org.gradle.api.Project import java.io.File internal fun Project.configureAndroidCompose( - extension: CommonExtension<*, *, *, *>, + extension: CommonExtension<*, *, *, *, *>, ) { extension.apply { buildFeatures.compose = true diff --git a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureKotlinAndroid.kt b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureKotlinAndroid.kt index 4064c3e..108da8b 100644 --- a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureKotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureKotlinAndroid.kt @@ -24,7 +24,7 @@ import org.gradle.api.Project import org.gradle.kotlin.dsl.provideDelegate internal fun Project.configureKotlinAndroid( - commonExtension: CommonExtension<*, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *>, ) { val compileSdk: String by project val minSdk: String by project diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3017897..7db1f7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Plugins -agp = "8.0.2" +agp = "8.1.0" dokka = "1.8.20" spotless = "6.20.0" mavenPublish = "0.25.2" From c035a561a3d5b6f3ed999b3b3c9b0d3b2b0ac3b6 Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 00:11:56 +0300 Subject: [PATCH 04/10] Update compose bom to v2023.08.00 --- .../composites/fiberglass/column/FiberglassFlowColumn.kt | 6 +++--- .../composites/fiberglass/row/FiberglassFlowRow.kt | 6 +++--- gradle.properties | 6 +++--- gradle/libs.versions.toml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/column/FiberglassFlowColumn.kt b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/column/FiberglassFlowColumn.kt index 3381832..23b22e9 100644 --- a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/column/FiberglassFlowColumn.kt +++ b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/column/FiberglassFlowColumn.kt @@ -38,7 +38,7 @@ import ru.ldralighieri.composites.fiberglass.model.FiberglassItem * @param contentPadding A padding around the whole content. Negative padding is not permitted — it * will cause IllegalArgumentException. * @param verticalArrangement The vertical arrangement of the layout's children. - * @param horizontalAlignment The horizontal alignment of the layout's children. + * @param horizontalArrangement The horizontal arrangement of the layout's virtual columns. * @param maxItemsInEachColumn The maximum number of items per column */ @Composable @@ -48,14 +48,14 @@ fun FiberglassFlowColumn( modifier: Modifier = Modifier, contentPadding: PaddingValues = PaddingValues(0.dp), verticalArrangement: Arrangement.Vertical = Arrangement.Top, - horizontalAlignment: Alignment.Horizontal = Alignment.Start, + horizontalArrangement: Arrangement.Horizontal = Arrangement.Start, maxItemsInEachColumn: Int = Int.MAX_VALUE ) { Box(modifier = modifier) { FlowColumn( modifier = Modifier.padding(contentPadding), verticalArrangement = verticalArrangement, - horizontalAlignment = horizontalAlignment, + horizontalArrangement = horizontalArrangement, maxItemsInEachColumn = maxItemsInEachColumn ) { items.forEach { item -> diff --git a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/row/FiberglassFlowRow.kt b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/row/FiberglassFlowRow.kt index abc2915..aa165d5 100644 --- a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/row/FiberglassFlowRow.kt +++ b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/row/FiberglassFlowRow.kt @@ -38,7 +38,7 @@ import ru.ldralighieri.composites.fiberglass.model.FiberglassRowItemSlots * @param contentPadding A padding around the whole content. Negative padding is not permitted — it * will cause IllegalArgumentException. * @param horizontalArrangement The horizontal arrangement of the layout's children. - * @param verticalAlignment The vertical alignment of the layout's children. + * @param verticalArrangement The vertical arrangement of the layout's virtual rows. * @param maxItemsInEachRow The maximum number of items per row */ @Composable @@ -48,14 +48,14 @@ fun FiberglassFlowRow( modifier: Modifier = Modifier, contentPadding: PaddingValues = PaddingValues(0.dp), horizontalArrangement: Arrangement.Horizontal = Arrangement.Start, - verticalAlignment: Alignment.Vertical = Alignment.Top, + verticalArrangement: Arrangement.Vertical = Arrangement.Top, maxItemsInEachRow: Int = Int.MAX_VALUE ) { Box(modifier = modifier) { FlowRow( modifier = Modifier.padding(contentPadding), horizontalArrangement = horizontalArrangement, - verticalAlignment = verticalAlignment, + verticalArrangement = verticalArrangement, maxItemsInEachRow = maxItemsInEachRow ) { items.forEach { item -> diff --git a/gradle.properties b/gradle.properties index 646eff4..6717765 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,9 +31,9 @@ SONATYPE_AUTOMATIC_RELEASE=true # Android android.useAndroidX=true -buildTools=33.0.2 -compileSdk=33 -targetSdk=33 +buildTools=34.0.0 +compileSdk=34 +targetSdk=34 minSdk=21 # Build features diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7db1f7f..c7e5bf7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,15 +8,15 @@ bcv = "0.13.2" gver = "0.47.0" # Kotlin -kotlin = "1.8.21" +kotlin = "1.9.0" # Androidx androidxCoreSplashscreen = "1.0.1" androidxActivity = "1.7.2" androidxPagingCompose = "3.2.0-beta01" # Compose -androidxComposeCompiler = "1.4.7" -androidxComposeBom = "2023.06.01" +androidxComposeCompiler = "1.5.1" +androidxComposeBom = "2023.08.00" # Accompanist accompanist = "0.30.1" From 5a011e182a1397a4f1abfc033ae1b8c0e163d16c Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 00:22:36 +0300 Subject: [PATCH 05/10] Add compose navigation v2.7.0 --- gradle/libs.versions.toml | 4 +-- sample/build.gradle.kts | 3 +-- .../sample/navigation/AppAnimatedNavHost.kt | 26 ++++++++++--------- .../sample/navigation/AppNavHost.kt | 2 +- .../sample/ui/app/CompositesAppState.kt | 4 +-- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c7e5bf7..a4e4071 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ kotlin = "1.9.0" # Androidx androidxCoreSplashscreen = "1.0.1" androidxActivity = "1.7.2" +androidxNavigation = "2.7.0" androidxPagingCompose = "3.2.0-beta01" # Compose androidxComposeCompiler = "1.5.1" @@ -31,6 +32,7 @@ ktlint = "0.49.1" # Androidx androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxCoreSplashscreen" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidxPagingCompose" } # Compose androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidxComposeBom" } @@ -48,8 +50,6 @@ androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-mani # Accompanist accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } -accompanist-navigation-material = { module = "com.google.accompanist:accompanist-navigation-material", version.ref = "accompanist" } -accompanist-navigation-animation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" } # Google google-material = { module = "com.google.android.material:material", version.ref = "googleMaterial" } diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 333f509..c4500ea 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -61,6 +61,7 @@ dependencies { // Androidx implementation(libs.androidx.core.splashscreen) implementation(libs.androidx.activity.compose) + implementation(libs.androidx.navigation.compose) // Compose implementation(platform(libs.androidx.compose.bom)) @@ -71,8 +72,6 @@ dependencies { // Accompanist implementation(libs.accompanist.systemuicontroller) - implementation(libs.accompanist.navigation.material) - implementation(libs.accompanist.navigation.animation) // Google implementation(libs.google.material) diff --git a/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppAnimatedNavHost.kt b/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppAnimatedNavHost.kt index 19e713e..b43d731 100644 --- a/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppAnimatedNavHost.kt +++ b/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppAnimatedNavHost.kt @@ -17,6 +17,7 @@ package ru.ldralighieri.composites.sample.navigation import androidx.compose.animation.AnimatedContentScope +import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.EnterTransition import androidx.compose.animation.ExitTransition import androidx.compose.animation.core.tween @@ -29,7 +30,7 @@ import androidx.compose.ui.Modifier import androidx.navigation.NavBackStackEntry import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController -import com.google.accompanist.navigation.animation.AnimatedNavHost +import androidx.navigation.compose.NavHost @Composable fun AppAnimatedNavHost( @@ -38,7 +39,7 @@ fun AppAnimatedNavHost( modifier: Modifier = Modifier, route: String? = null, - enterTransition: (AnimatedContentScope.() -> EnterTransition) = { + enterTransition: (AnimatedContentTransitionScope.() -> EnterTransition) = { slideInHorizontally( initialOffsetX = { 300 }, animationSpec = tween(durationMillis = 300) @@ -46,7 +47,7 @@ fun AppAnimatedNavHost( fadeIn(animationSpec = tween(durationMillis = 300)) }, - exitTransition: (AnimatedContentScope.() -> ExitTransition) = { + exitTransition: (AnimatedContentTransitionScope.() -> ExitTransition) = { slideOutHorizontally( targetOffsetX = { -300 }, animationSpec = tween(durationMillis = 300) @@ -54,15 +55,16 @@ fun AppAnimatedNavHost( fadeOut(animationSpec = tween(durationMillis = 300)) }, - popEnterTransition: (AnimatedContentScope.() -> EnterTransition) = { - slideInHorizontally( - initialOffsetX = { -300 }, - animationSpec = tween(durationMillis = 300) - ) + - fadeIn(animationSpec = tween(durationMillis = 300)) - }, + popEnterTransition: (AnimatedContentTransitionScope.() -> EnterTransition) = + { + slideInHorizontally( + initialOffsetX = { -300 }, + animationSpec = tween(durationMillis = 300) + ) + + fadeIn(animationSpec = tween(durationMillis = 300)) + }, - popExitTransition: (AnimatedContentScope.() -> ExitTransition) = { + popExitTransition: (AnimatedContentTransitionScope.() -> ExitTransition) = { slideOutHorizontally( targetOffsetX = { 300 }, animationSpec = tween(durationMillis = 300) @@ -72,7 +74,7 @@ fun AppAnimatedNavHost( builder: NavGraphBuilder.() -> Unit ) { - AnimatedNavHost( + NavHost( navController = navController, startDestination = startDestination, modifier = modifier, diff --git a/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppNavHost.kt b/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppNavHost.kt index 8051930..bce674e 100644 --- a/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppNavHost.kt +++ b/sample/src/main/kotlin/ru/ldralighieri/composites/sample/navigation/AppNavHost.kt @@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.NavHostController import androidx.navigation.NavOptions -import com.google.accompanist.navigation.animation.composable +import androidx.navigation.compose.composable import ru.ldralighieri.composites.sample.ui.CompositesScreen import ru.ldralighieri.composites.sample.ui.fiberglass.FiberglassColumnScreen import ru.ldralighieri.composites.sample.ui.fiberglass.FiberglassGridScreen diff --git a/sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/app/CompositesAppState.kt b/sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/app/CompositesAppState.kt index aae46c1..f41ca00 100644 --- a/sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/app/CompositesAppState.kt +++ b/sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/app/CompositesAppState.kt @@ -23,10 +23,10 @@ import androidx.navigation.NavDestination import androidx.navigation.NavHostController import androidx.navigation.NavOptions import androidx.navigation.compose.currentBackStackEntryAsState -import com.google.accompanist.navigation.animation.rememberAnimatedNavController +import androidx.navigation.compose.rememberNavController @Composable -fun rememberCompositesAppState(navController: NavHostController = rememberAnimatedNavController()) = +fun rememberCompositesAppState(navController: NavHostController = rememberNavController()) = remember(navController) { CompositesAppState(navController) } @Stable From 44eec742c4f95e71f890a799878a2be790b7f7de Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 00:25:13 +0300 Subject: [PATCH 06/10] Update paging compose to v3.2.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4e4071..a3c1f06 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ kotlin = "1.9.0" androidxCoreSplashscreen = "1.0.1" androidxActivity = "1.7.2" androidxNavigation = "2.7.0" -androidxPagingCompose = "3.2.0-beta01" +androidxPagingCompose = "3.2.0" # Compose androidxComposeCompiler = "1.5.1" androidxComposeBom = "2023.08.00" From 7b6554ad08470f9531b05f2369d4d670cf8b8dbe Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 00:27:19 +0300 Subject: [PATCH 07/10] Update maven publish to v0.25.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a3c1f06..cb2b43e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ agp = "8.1.0" dokka = "1.8.20" spotless = "6.20.0" -mavenPublish = "0.25.2" +mavenPublish = "0.25.3" bcv = "0.13.2" gver = "0.47.0" From a64afaa0ca9de931284cdf7a206c9b628848d7eb Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 00:32:02 +0300 Subject: [PATCH 08/10] Fiberglass items @Immutable -> @Stable --- .../composites/fiberglass/model/FiberglassAliases.kt | 3 --- .../composites/fiberglass/model/FiberglassItems.kt | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassAliases.kt b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassAliases.kt index ff89ca4..8da6966 100644 --- a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassAliases.kt +++ b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassAliases.kt @@ -16,7 +16,6 @@ package ru.ldralighieri.composites.fiberglass.model -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.lazy.LazyItemScope @@ -74,14 +73,12 @@ typealias FiberglassLazyGridItemSlots = Map, Fibergla /** * Fiberglass[Vertical|Horizontal]Grid slot alias */ -@OptIn(ExperimentalFoundationApi::class) typealias FiberglassLazyStaggeredGridItemSlot = @Composable LazyStaggeredGridItemScope.(item: FiberglassItem) -> Unit /** * Fiberglass[Vertical|Horizontal]Grid slots map alias */ -@OptIn(ExperimentalFoundationApi::class) typealias FiberglassLazyStaggeredGridItemSlots = Map, FiberglassLazyStaggeredGridItemSlot> diff --git a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassItems.kt b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassItems.kt index ebd5c0c..9cb0e56 100644 --- a/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassItems.kt +++ b/composites-fiberglass/src/main/kotlin/ru/ldralighieri/composites/fiberglass/model/FiberglassItems.kt @@ -16,12 +16,12 @@ package ru.ldralighieri.composites.fiberglass.model -import androidx.compose.runtime.Immutable +import androidx.compose.runtime.Stable /** * Item interface for Fiberglass */ -@Immutable +@Stable interface FiberglassItem { val id: Any } @@ -29,7 +29,7 @@ interface FiberglassItem { /** * StickyHeader interface for FiberglassLazyColumn */ -@Immutable +@Stable interface FiberglassStickyHeaderItem : FiberglassItem { val title: String } From e067bd1e2c93b3bc21ab86d2822682245ec1c0b4 Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 01:14:07 +0300 Subject: [PATCH 09/10] Run apiDump --- .../composites/Project+configureAndroidCompose.kt | 4 ++-- composites-fiberglass/api/composites-fiberglass.api | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt index 6ef8e94..180bdcc 100644 --- a/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt @@ -42,7 +42,7 @@ internal fun Project.configureAndroidCompose( private fun Project.buildComposeMetricsParameters(): List = buildList { val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics") if (enableMetricsProvider.orNull == "true") { - val metricsFolder = File(project.buildDir, "compose-metrics") + val metricsFolder = File(project.layout.buildDirectory.asFile.get(), "compose-metrics") add("-P") add("plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath) @@ -50,7 +50,7 @@ private fun Project.buildComposeMetricsParameters(): List = buildList { val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports") if (enableReportsProvider.orNull == "true") { - val reportsFolder = File(project.buildDir, "compose-reports") + val reportsFolder = File(project.layout.buildDirectory.asFile.get(), "compose-reports") add("-P") add("plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath) diff --git a/composites-fiberglass/api/composites-fiberglass.api b/composites-fiberglass/api/composites-fiberglass.api index d8976d3..1792944 100644 --- a/composites-fiberglass/api/composites-fiberglass.api +++ b/composites-fiberglass/api/composites-fiberglass.api @@ -3,7 +3,7 @@ public final class ru/ldralighieri/composites/fiberglass/column/FiberglassColumn } public final class ru/ldralighieri/composites/fiberglass/column/FiberglassFlowColumnKt { - public static final fun FiberglassFlowColumn (Ljava/util/List;Ljava/util/Map;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment$Horizontal;ILandroidx/compose/runtime/Composer;II)V + public static final fun FiberglassFlowColumn (Ljava/util/List;Ljava/util/Map;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/foundation/layout/Arrangement$Horizontal;ILandroidx/compose/runtime/Composer;II)V } public final class ru/ldralighieri/composites/fiberglass/column/FiberglassLazyColumnKt { @@ -37,7 +37,7 @@ public abstract interface class ru/ldralighieri/composites/fiberglass/model/Fibe } public final class ru/ldralighieri/composites/fiberglass/row/FiberglassFlowRowKt { - public static final fun FiberglassFlowRow (Ljava/util/List;Ljava/util/Map;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/ui/Alignment$Vertical;ILandroidx/compose/runtime/Composer;II)V + public static final fun FiberglassFlowRow (Ljava/util/List;Ljava/util/Map;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;ILandroidx/compose/runtime/Composer;II)V } public final class ru/ldralighieri/composites/fiberglass/row/FiberglassLazyRowKt { From dad8316c7906803a81911e76c41b0e68c271efa9 Mon Sep 17 00:00:00 2001 From: Vladimir Raupov Date: Mon, 21 Aug 2023 10:23:53 +0300 Subject: [PATCH 10/10] Updated README.md of each module and CHANGELOG.md for version 0.3.0 --- CHANGELOG.md | 25 ++++++++++++++++++------- README.md | 13 ++++++++++--- composites-fiberglass/README.md | 2 +- gradle.properties | 2 +- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71c1960..315f43c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,20 @@ # ChangeLog +## Version 0.3.0 + +* Update: Fiberglass(`composites-fiberglass`) module: + - Fiberglass items now @Stable + - FiberglassFlowColumn and FiberglassFlowRow API +* Update: Target SDK to v34. +* Update: Kotlin to v1.9.0. +* Update: Compose BOM to v2023.08.00. +* Update: Minor update of other libraries. + + ## Version 0.2.0 -* New: Fiberglass(`composites-fiberglass`) composites: +* New: Fiberglass(`composites-fiberglass`) module: - Fiberglass flow column Composite - Fiberglass flow row Composite - Fiberglass lazy horizontal grid Composite @@ -31,11 +42,11 @@ ## Version 0.1.0 * New: Fiberglass(`composites-fiberglass`) module: - - Fiberglass column Composite - - Fiberglass lazy column Composite - - Fiberglass lazy column Composite for `LazyPagingItems` - - Fiberglass lazy column Composite with sticky headers - - Fiberglass row Composite - - Fiberglass lazy row Composite + - Fiberglass column Composite + - Fiberglass lazy column Composite + - Fiberglass lazy column Composite for `LazyPagingItems` + - Fiberglass lazy column Composite with sticky headers + - Fiberglass row Composite + - Fiberglass lazy row Composite * Update: Kotlin to v1.8.0. * Update: Compose BOM to v2023.01.00. diff --git a/README.md b/README.md index 246241a..0c378dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Maven Central](https://img.shields.io/maven-central/v/ru.ldralighieri.composites/composites-fiberglass.svg)](https://search.maven.org/search?q=g:ru.ldralighieri.composites) -[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.8.21-blue.svg?logo=kotlin)](https://kotlinlang.org) -[![Compose BOM Version](https://img.shields.io/badge/Compose-v2023.06.01-blue.svg?logo=jetpackcompose)](https://developer.android.com/jetpack/compose) +[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.0-blue.svg?logo=kotlin)](https://kotlinlang.org) +[![Compose BOM Version](https://img.shields.io/badge/Compose-v2023.08.00-blue.svg?logo=jetpackcompose)](https://developer.android.com/jetpack/compose) [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg)](https://android-arsenal.com/api?level=21) @@ -16,6 +16,11 @@ Please consider giving this repository a star ⭐ if you like the project. +## Articles +* [Compose these composites][compose-these-composites] +* [Reach out to infinity][reach-out-to-infinity] + + ## Modules * [composites-fiberglass] — A tool for building complex screens based on simple blocks. @@ -26,7 +31,7 @@ Add one or more dependencies: ```kotlin dependencies { - implementation("ru.ldralighieri.composites:composites-fiberglass:0.2.0") + implementation("ru.ldralighieri.composites:composites-fiberglass:0.3.0") } ``` @@ -81,5 +86,7 @@ limitations under the License. [compose]: https://developer.android.com/jetpack/compose +[compose-these-composites]: https://medium.com/@ldralighieri/compose-these-composites-8ea923e4a34c +[reach-out-to-infinity]: https://medium.com/@ldralighieri/reach-out-to-infinity-bba17019a938 [composites-fiberglass]: https://github.com/LDRAlighieri/Composites/tree/main/composites-fiberglass [performance]: https://developer.android.com/jetpack/compose/performance#build-release diff --git a/composites-fiberglass/README.md b/composites-fiberglass/README.md index 0569eba..c011f22 100644 --- a/composites-fiberglass/README.md +++ b/composites-fiberglass/README.md @@ -30,7 +30,7 @@ Add dependency: ```kotlin dependencies { - implementation("ru.ldralighieri.composites:composites-fiberglass:0.2.0") + implementation("ru.ldralighieri.composites:composites-fiberglass:0.3.0") } ``` diff --git a/gradle.properties b/gradle.properties index 6717765..d49e14c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000 # Maven GROUP=ru.ldralighieri.composites -VERSION_NAME=0.3.0-SNAPSHOT +VERSION_NAME=0.3.0 POM_DESCRIPTION=Composites are a group of tools and handy libraries that make it easier to use Jetpack Compose.