Skip to content

Commit 33c89d6

Browse files
authored
Merge pull request #625 from kizitonwose/release_2.8.0
Release 2.8.0
2 parents c1fa08d + 4e17686 commit 33c89d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+315
-936
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ For the compose calendar library, ensure that you are using the library version
137137
| 1.5.x | 2.4.x | - |
138138
| 1.6.x | 2.5.x | 2.5.x |
139139
| 1.7.x | 2.6.x | 2.6.x |
140-
| 1.8.x | 2.7.x | 2.7.x |
140+
| 1.8.x | 2.7.x - 2.8.x | 2.7.x - 2.8.x |
141141

142142
## Usage
143143

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ allprojects {
4545
afterEvaluate {
4646
// Android and Multiplatform libraries are published separately
4747
// See https://github.com/kizitonwose/Calendar/pull/561
48-
disableMavenPublicationsIfNeeded(multiplatformProjects, Version.multiplatfrom)
48+
disableMavenPublicationsIfNeeded(multiplatformProjects, Version.multiplatform)
4949
disableMavenPublicationsIfNeeded(androidProjects, Version.android)
5050
}
5151
}

buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ object Config {
1111
}
1212

1313
object Version {
14-
val android = "2.7.1-SNAPSHOT"
15-
val multiplatfrom = "2.7.1-SNAPSHOT"
14+
const val android = "2.8.1-SNAPSHOT"
15+
const val multiplatform = "2.8.1-SNAPSHOT"
1616

1717
fun String.isNoPublish() = this == VERSION_NO_PUBLISH
1818
}
1919

20-
private val VERSION_NO_PUBLISH = "NO_PUBLISH"
20+
private const val VERSION_NO_PUBLISH = "NO_PUBLISH"
2121

2222
object Android {
2323
const val minSdk = 21

compose-multiplatform/library/api/android/library.api

Lines changed: 32 additions & 84 deletions
Large diffs are not rendered by default.

compose-multiplatform/library/api/desktop/library.api

Lines changed: 32 additions & 84 deletions
Large diffs are not rendered by default.

compose-multiplatform/library/api/library.klib.api

Lines changed: 30 additions & 84 deletions
Large diffs are not rendered by default.

compose-multiplatform/library/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,5 @@ android {
137137
}
138138

139139
mavenPublishing {
140-
coordinates(version = Version.multiplatfrom)
140+
coordinates(version = Version.multiplatform)
141141
}

compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/compose/CalendarState.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import androidx.compose.runtime.setValue
1919
import com.kizitonwose.calendar.core.CalendarDay
2020
import com.kizitonwose.calendar.core.DayPosition
2121
import com.kizitonwose.calendar.core.OutDateStyle
22-
import com.kizitonwose.calendar.core.YearMonth
2322
import com.kizitonwose.calendar.core.firstDayOfWeekFromLocale
2423
import com.kizitonwose.calendar.core.format.fromIso8601YearMonth
2524
import com.kizitonwose.calendar.core.format.toIso8601String
25+
import com.kizitonwose.calendar.core.now
2626
import com.kizitonwose.calendar.data.DataStore
2727
import com.kizitonwose.calendar.data.VisibleItemState
2828
import com.kizitonwose.calendar.data.checkRange
@@ -35,6 +35,7 @@ import com.kizitonwose.calendar.data.log
3535
import com.kizitonwose.calendar.data.positionYearMonth
3636
import kotlinx.datetime.DayOfWeek
3737
import kotlinx.datetime.LocalDate
38+
import kotlinx.datetime.YearMonth
3839

3940
/**
4041
* Creates a [CalendarState] that is remembered across compositions.
@@ -54,7 +55,7 @@ public fun rememberCalendarState(
5455
outDateStyle: OutDateStyle = OutDateStyle.EndOfRow,
5556
): CalendarState {
5657
return rememberSaveable(
57-
inputs = arrayOf(
58+
inputs = arrayOf<Any>(
5859
startMonth,
5960
endMonth,
6061
firstVisibleMonth,

compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/compose/heatmapcalendar/HeatMapCalendarState.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import androidx.compose.runtime.setValue
1717
import com.kizitonwose.calendar.compose.CalendarInfo
1818
import com.kizitonwose.calendar.compose.CalendarLayoutInfo
1919
import com.kizitonwose.calendar.core.CalendarMonth
20-
import com.kizitonwose.calendar.core.YearMonth
2120
import com.kizitonwose.calendar.core.firstDayOfWeekFromLocale
2221
import com.kizitonwose.calendar.core.format.fromIso8601YearMonth
2322
import com.kizitonwose.calendar.core.format.toIso8601String
23+
import com.kizitonwose.calendar.core.now
2424
import com.kizitonwose.calendar.data.DataStore
2525
import com.kizitonwose.calendar.data.VisibleItemState
2626
import com.kizitonwose.calendar.data.checkRange
@@ -29,6 +29,7 @@ import com.kizitonwose.calendar.data.getMonthIndex
2929
import com.kizitonwose.calendar.data.getMonthIndicesCount
3030
import com.kizitonwose.calendar.data.log
3131
import kotlinx.datetime.DayOfWeek
32+
import kotlinx.datetime.YearMonth
3233

3334
/**
3435
* Creates a [HeatMapCalendarState] that is remembered across compositions.
@@ -46,7 +47,7 @@ public fun rememberHeatMapCalendarState(
4647
firstDayOfWeek: DayOfWeek = firstDayOfWeekFromLocale(),
4748
): HeatMapCalendarState {
4849
return rememberSaveable(
49-
inputs = arrayOf(
50+
inputs = arrayOf<Any>(
5051
startMonth,
5152
endMonth,
5253
firstVisibleMonth,

compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/compose/weekcalendar/WeekCalendarState.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ import com.kizitonwose.calendar.compose.ItemPlacementInfo
2020
import com.kizitonwose.calendar.core.Week
2121
import com.kizitonwose.calendar.core.WeekDay
2222
import com.kizitonwose.calendar.core.WeekDayPosition
23-
import com.kizitonwose.calendar.core.YearMonth
24-
import com.kizitonwose.calendar.core.atEndOfMonth
25-
import com.kizitonwose.calendar.core.atStartOfMonth
2623
import com.kizitonwose.calendar.core.firstDayOfWeekFromLocale
2724
import com.kizitonwose.calendar.core.format.fromIso8601LocalDate
2825
import com.kizitonwose.calendar.core.format.toIso8601String
@@ -38,6 +35,7 @@ import com.kizitonwose.calendar.data.getWeekIndicesCount
3835
import com.kizitonwose.calendar.data.log
3936
import kotlinx.datetime.DayOfWeek
4037
import kotlinx.datetime.LocalDate
38+
import kotlinx.datetime.YearMonth
4139

4240
/**
4341
* Creates a [WeekCalendarState] that is remembered across compositions.
@@ -49,13 +47,13 @@ import kotlinx.datetime.LocalDate
4947
*/
5048
@Composable
5149
public fun rememberWeekCalendarState(
52-
startDate: LocalDate = YearMonth.now().atStartOfMonth(),
53-
endDate: LocalDate = YearMonth.now().atEndOfMonth(),
50+
startDate: LocalDate = YearMonth.now().firstDay,
51+
endDate: LocalDate = YearMonth.now().lastDay,
5452
firstVisibleWeekDate: LocalDate = LocalDate.now(),
5553
firstDayOfWeek: DayOfWeek = firstDayOfWeekFromLocale(),
5654
): WeekCalendarState {
5755
return rememberSaveable(
58-
inputs = arrayOf(
56+
inputs = arrayOf<Any>(
5957
startDate,
6058
endDate,
6159
firstVisibleWeekDate,

0 commit comments

Comments
 (0)