update to compose 1.5.2

epicarchitect · Oct 1, 2023 · a6e390e · a6e390e
1 parent 22d241e
commit a6e390e
Show file tree

Hide file tree

Showing 36 changed files with 405 additions and 725 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Compose Multiplatform library for displaying epic calendars.
 
 ```Kotlin
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
     iosX64()
     iosArm64()
@@ -27,10 +27,10 @@ The library is published on MavenCentral.
 
 ```Kotlin
 dependencies {
-    commonMainImplementation("io.github.epicarchitect:calendar-compose-basis:1.0.4")
-    commonMainImplementation("io.github.epicarchitect:calendar-compose-ranges:1.0.4") // includes basis
-    commonMainImplementation("io.github.epicarchitect:calendar-compose-pager:1.0.4") // includes basis
-    commonMainImplementation("io.github.epicarchitect:calendar-compose-datepicker:1.0.4") // includes pager + ranges
+    commonMainImplementation("io.github.epicarchitect:calendar-compose-basis:1.0.5")
+    commonMainImplementation("io.github.epicarchitect:calendar-compose-ranges:1.0.5") // includes basis
+    commonMainImplementation("io.github.epicarchitect:calendar-compose-pager:1.0.5") // includes basis
+    commonMainImplementation("io.github.epicarchitect:calendar-compose-datepicker:1.0.5") // includes pager + ranges
 }
 ```
 

diff --git a/build-logic/src/main/kotlin/convention/Constants.kt b/build-logic/src/main/kotlin/convention/Constants.kt
@@ -2,8 +2,8 @@ package convention
 
 object Constants {
     const val JVM_TARGET = 11
-    const val ANDROID_TARGET_SDK = 33
+    const val ANDROID_TARGET_SDK = 34
     const val ANDROID_MIN_SDK = 26
     const val EPICARCHITECT_GROUP_NAME = "io.github.epicarchitect"
-    const val EPIC_CALENDAR_VERSION = "1.0.4"
+    const val EPIC_CALENDAR_VERSION = "1.0.5"
 }
diff --git a/build-logic/src/main/kotlin/convention/multiplatform/library.gradle.kts b/build-logic/src/main/kotlin/convention/multiplatform/library.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
     iosX64()
     iosArm64()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Apr 12 23:34:14 NOVT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/...-basis/src/commonMain/kotlin/epicarchitect/calendar/compose/basis/state/ImmutableState.kt b/...-basis/src/commonMain/kotlin/epicarchitect/calendar/compose/basis/state/ImmutableState.kt
@@ -1,7 +1,6 @@
 package epicarchitect.calendar.compose.basis.state
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue

diff --git a/...epicker/src/commonMain/kotlin/epicarchitect/calendar/compose/datepicker/EpicDatePicker.kt b/...epicker/src/commonMain/kotlin/epicarchitect/calendar/compose/datepicker/EpicDatePicker.kt
@@ -6,7 +6,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import epicarchitect.calendar.compose.basis.BasisDayOfMonthContent
 import epicarchitect.calendar.compose.basis.BasisDayOfWeekContent

diff --git a/...ose-pager/src/commonMain/kotlin/epicarchitect/calendar/compose/pager/EpicCalendarPager.kt b/...ose-pager/src/commonMain/kotlin/epicarchitect/calendar/compose/pager/EpicCalendarPager.kt
@@ -13,7 +13,6 @@ import epicarchitect.calendar.compose.basis.BasisEpicCalendar
 import epicarchitect.calendar.compose.basis.DefaultDayOfMonthContent
 import epicarchitect.calendar.compose.basis.DefaultDayOfWeekContent
 import epicarchitect.calendar.compose.basis.getByIndex
-import epicarchitect.calendar.compose.basis.size
 import epicarchitect.calendar.compose.basis.state.rememberBasisEpicCalendarState
 import epicarchitect.calendar.compose.pager.config.LocalEpicCalendarPagerConfig
 import epicarchitect.calendar.compose.pager.state.EpicCalendarPagerState
@@ -41,9 +40,6 @@ fun EpicCalendarPager(
         HorizontalPager(
             modifier = modifier,
             state = state.pagerState,
-            pageCount = remember(state.monthRange) {
-                state.monthRange.size()
-            },
             verticalAlignment = Alignment.Top
         ) { page ->
             BasisEpicCalendar(

diff --git a/...ompose-pager/src/commonMain/kotlin/epicarchitect/calendar/compose/pager/state/Defaults.kt b/...ompose-pager/src/commonMain/kotlin/epicarchitect/calendar/compose/pager/state/Defaults.kt
@@ -2,6 +2,6 @@ package epicarchitect.calendar.compose.pager.state
 
 import epicarchitect.calendar.compose.basis.EpicMonth
 import kotlinx.datetime.Month
-import kotlinx.datetime.TimeZone
 
-fun defaultEpicCalendarPagerMonthRange() = EpicMonth(1900, Month.JANUARY)..EpicMonth(2100, Month.DECEMBER)
+fun defaultEpicCalendarPagerMonthRange() =
+    EpicMonth(1900, Month.JANUARY)..EpicMonth(2100, Month.DECEMBER)
diff --git a/...se-pager/src/commonMain/kotlin/epicarchitect/calendar/compose/pager/state/MutableState.kt b/...se-pager/src/commonMain/kotlin/epicarchitect/calendar/compose/pager/state/MutableState.kt
@@ -13,6 +13,7 @@ import epicarchitect.calendar.compose.basis.addMonths
 import epicarchitect.calendar.compose.basis.addYears
 import epicarchitect.calendar.compose.basis.getByIndex
 import epicarchitect.calendar.compose.basis.indexOf
+import epicarchitect.calendar.compose.basis.size
 import epicarchitect.calendar.compose.pager.config.EpicCalendarPagerConfig
 import epicarchitect.calendar.compose.pager.config.LocalEpicCalendarPagerConfig
 
@@ -50,7 +51,9 @@ fun rememberEpicCalendarPagerState(
     val pagerState = rememberPagerState(
         initialPage = remember(monthRange, initialMonth) {
             monthRange.indexOf(initialMonth) ?: 0
-        }
+        },
+        initialPageOffsetFraction = 0f,
+        pageCount = monthRange::size
     )
 
     return remember(

diff --git a/...ges/src/commonMain/kotlin/epicarchitect/calendar/compose/ranges/CalculateEpicRangeInfo.kt b/...ges/src/commonMain/kotlin/epicarchitect/calendar/compose/ranges/CalculateEpicRangeInfo.kt
@@ -2,11 +2,11 @@ package epicarchitect.calendar.compose.ranges
 
 import androidx.compose.ui.unit.IntOffset
 import epicarchitect.calendar.compose.basis.EpicCalendarConstants
-import epicarchitect.calendar.compose.basis.state.EpicCalendarGridInfo
 import epicarchitect.calendar.compose.basis.atEndDay
 import epicarchitect.calendar.compose.basis.atStartDay
 import epicarchitect.calendar.compose.basis.epicMonth
 import epicarchitect.calendar.compose.basis.index
+import epicarchitect.calendar.compose.basis.state.EpicCalendarGridInfo
 import kotlinx.datetime.LocalDate
 
 internal fun calculateEpicRangeInfo(
@@ -42,8 +42,8 @@ internal fun calculateEpicRangeInfo(
 
                 gridInfo.nextMonth -> {
                     gridInfo.currentMonth.atStartDay().dayOfWeek.index() +
-                            gridInfo.currentMonth.numberOfDays +
-                            startDate.dayOfMonth - 1
+                        gridInfo.currentMonth.numberOfDays +
+                        startDate.dayOfMonth - 1
                 }
 
                 else -> {
@@ -70,8 +70,8 @@ internal fun calculateEpicRangeInfo(
 
                 gridInfo.nextMonth -> {
                     gridInfo.currentMonth.atStartDay().dayOfWeek.index() +
-                            gridInfo.currentMonth.numberOfDays +
-                            endDate.dayOfMonth - 1
+                        gridInfo.currentMonth.numberOfDays +
+                        endDate.dayOfMonth - 1
                 }
 
                 else -> {

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,6 +1,6 @@
 [libraries]
-android-gradlePlugin = "com.android.tools.build:gradle:8.0.0"
-kotlin-gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
-compose-gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:1.4.0"
-kotlin-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
-android-activityCompose = "androidx.activity:activity-compose:1.7.1"
+android-gradlePlugin = "com.android.tools.build:gradle:8.1.2"
+kotlin-gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
+compose-gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:1.5.2"
+kotlin-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.1"
+android-activityCompose = "androidx.activity:activity-compose:1.7.2"
diff --git a/sample/ios-app/Podfile.lock b/sample/ios-app/Podfile.lock
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  shared: b7f8815660e2de50afa0ead586037195ce420ad9
+  shared: df03afde90acfa8db25727b36ecbd1eba27af1c6
 
 PODFILE CHECKSUM: c059e725210354aad0967f93f1e9d1cdeea0af8c
 

diff --git a/sample/ios-app/Pods/Local Podspecs/shared.podspec.json b/sample/ios-app/Pods/Local Podspecs/shared.podspec.json
diff --git a/sample/ios-app/Pods/Manifest.lock b/sample/ios-app/Pods/Manifest.lock