Merge pull request #20 from andrey-ananiev/master

Version for Compose 1.7.0
WojciechOsak · Dec 4, 2024 · 3e75a4b · 3e75a4b
2 parents 55e23f7 + 4c6b53f
commit 3e75a4b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/calendar/src/commonMain/kotlin/io/wojciechosak/calendar/view/HorizontalCalendarView.kt b/calendar/src/commonMain/kotlin/io/wojciechosak/calendar/view/HorizontalCalendarView.kt
@@ -39,7 +39,7 @@ fun HorizontalCalendarView(
 	),
 	modifier: Modifier = Modifier,
 	pageSize: PageSize = PageSize.Fill,
-	beyondBoundsPageCount: Int = 0,
+	beyondViewportPageCount: Int = 0,
 	contentPadding: PaddingValues = PaddingValues(0.dp),
 	calendarAnimator: CalendarAnimator = CalendarAnimator(startDate),
 	calendarView: @Composable (monthOffset: Int) -> Unit = {
@@ -61,7 +61,7 @@ fun HorizontalCalendarView(
 		state = pagerState,
 		modifier = modifier,
 		pageSize = pageSize,
-		beyondBoundsPageCount = beyondBoundsPageCount,
+		beyondViewportPageCount = beyondViewportPageCount,
 		contentPadding = contentPadding,
 	) {
 		val index = it - INITIAL_PAGE_INDEX

diff --git a/calendar/src/commonMain/kotlin/io/wojciechosak/calendar/view/VerticalCalendarView.kt b/calendar/src/commonMain/kotlin/io/wojciechosak/calendar/view/VerticalCalendarView.kt
@@ -34,7 +34,7 @@ fun VerticalCalendarView(
 	modifier: Modifier = Modifier,
 	pageSize: PageSize = PageSize.Fill,
 	contentPadding: PaddingValues = PaddingValues(0.dp),
-	beyondBoundsPageCount: Int = 0,
+	beyondViewportPageCount: Int = 0,
 	calendarView: @Composable (monthOffset: Int) -> Unit,
 ) {
 	val pagerState =
@@ -50,7 +50,7 @@ fun VerticalCalendarView(
 		state = pagerState,
 		modifier = modifier.fillMaxWidth(),
 		pageSize = pageSize,
-		beyondBoundsPageCount = beyondBoundsPageCount,
+		beyondViewportPageCount = beyondViewportPageCount,
 		contentPadding = contentPadding,
 	) {
 		val index = it - INITIAL_PAGE_INDEX

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 
-kotlin = "2.0.0"
-agp = "8.2.2"
-compose = "1.6.10"
-androidx-appcompat = "1.6.1"
-androidx-activityCompose = "1.9.0"
-compose-uitooling = "1.6.7"
-kotlinx-coroutines = "1.8.1"
+kotlin = "2.0.21"
+agp = "8.7.2"
+compose = "1.7.0"
+androidx-appcompat = "1.7.0"
+androidx-activityCompose = "1.9.3"
+compose-uitooling = "1.7.5"
+kotlinx-coroutines = "1.9.0"
 composeIcons = "1.1.0"
-kotlinx-datetime = "0.5.0"
+kotlinx-datetime = "0.6.0"
 voyager = "1.1.0-beta01"
 ktlint = "4.2.0"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,5 @@
+jdk:
+  - openjdk17
+before_install:
+  - yarn install
+  - ./gradlew clean kotlinNpmInstall
diff --git a/sample/composeApp/src/commonMain/kotlin/io/wojciechosak/calendar/calendar/App.kt b/sample/composeApp/src/commonMain/kotlin/io/wojciechosak/calendar/calendar/App.kt
@@ -11,8 +11,8 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SmallTopAppBar
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -38,7 +38,7 @@ internal fun App() {
 			Scaffold(
 				topBar = {
 					val navigator = LocalNavigator.current
-					SmallTopAppBar(
+					TopAppBar(
 						colors =
 						TopAppBarDefaults.topAppBarColors(
 							containerColor = MaterialTheme.colorScheme.primary,