From a9b7ac253b75881e3853f3a9a9ec96e447010596 Mon Sep 17 00:00:00 2001 From: Kizito Nwose Date: Sun, 8 Dec 2024 11:57:15 +0100 Subject: [PATCH 1/3] Prepare version 2.6.1 --- .../kizitonwose/calendar/buildsrc/Build.kt | 4 ++-- gradle/libs.versions.toml | 20 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt index b4ad8e71..448d2d1e 100644 --- a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt +++ b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt @@ -12,8 +12,8 @@ object Config { } object Version { - val android = "2.6.1-SNAPSHOT" - val multiplatfrom = "2.6.1-SNAPSHOT" + val android = "2.6.1" + val multiplatfrom = "2.6.1" fun String.isNoPublish() = this == VERSION_NO_PUBLISH } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7cd4eb2b..d88a42c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -agp = "8.5.2" +agp = "8.7.3" kotlin = "2.0.20" -composeAndroid = "1.7.2" -composeMultiplatform = "1.7.0-beta02" +composeAndroid = "1.7.5" +composeMultiplatform = "1.7.1" espresso = "3.6.1" -junit5 = "5.11.0" -kotlinxSerialization = "1.7.1" +junit5 = "5.11.3" +kotlinxSerialization = "1.7.3" [libraries] kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } @@ -13,11 +13,11 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.0" } -desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.2" } +desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.3" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" } androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" } -androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" } +androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.0" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.3.2" } androidx-cardview = { module = "androidx.cardview:cardview", version = "1.0.0" } material-view = { module = "com.google.android.material:material", version = "1.12.0" } @@ -35,9 +35,9 @@ compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "composeAndro compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "composeAndroid" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeAndroid" } compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "composeAndroid" } -compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.0" } -compose-activity = { module = "androidx.activity:activity-compose", version = "1.9.2" } -compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.8.1" } +compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.1" } +compose-activity = { module = "androidx.activity:activity-compose", version = "1.9.3" } +compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.8.4" } compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeAndroid" } compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "composeAndroid" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f249f35e..ce28d8bd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jun 18 20:39:23 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From b0e5f7f6167c9d511b46d909601948b8528419da Mon Sep 17 00:00:00 2001 From: Kizito Nwose Date: Sun, 8 Dec 2024 11:59:29 +0100 Subject: [PATCH 2/3] Prepare next development version --- .../src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt index 448d2d1e..83577f71 100644 --- a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt +++ b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt @@ -12,8 +12,8 @@ object Config { } object Version { - val android = "2.6.1" - val multiplatfrom = "2.6.1" + val android = "2.6.2-SNAPSHOT" + val multiplatfrom = "2.6.2-SNAPSHOT" fun String.isNoPublish() = this == VERSION_NO_PUBLISH } From 42ab0722d599dd828141ca50880f6b2fe1a18b0b Mon Sep 17 00:00:00 2001 From: Kizito Nwose Date: Sun, 8 Dec 2024 12:19:44 +0100 Subject: [PATCH 3/3] Update README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index a4a1ba30..cc1f866c 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,7 @@ A highly customizable calendar library for Android and Compose Multiplatform, ba [![Twitter](https://img.shields.io/badge/Twitter-@kizitonwose-9C27B0.svg)](https://twitter.com/kizitonwose) [![Android Library](https://img.shields.io/badge/dynamic/xml.svg?label=Android%20Library&color=blue&url=https://repo1.maven.org/maven2/com/kizitonwose/calendar/core/maven-metadata.xml&query=(//metadata/versioning/versions/version)[not(contains(text(),%27-%27))][last()])](https://central.sonatype.com/search?q=g:com.kizitonwose.calendar) -[![Android Library Beta](https://img.shields.io/badge/dynamic/xml.svg?label=Android%20Library%20Beta&color=slateblue&url=https://repo1.maven.org/maven2/com/kizitonwose/calendar/core/maven-metadata.xml&query=(//metadata/versioning/versions/version)[contains(text(),%27beta%27)][last()])](https://central.sonatype.com/search?q=g:com.kizitonwose.calendar) [![Multiplatform Library](https://img.shields.io/badge/dynamic/xml.svg?label=Multiplatform%20Library&color=blue&url=https://repo1.maven.org/maven2/com/kizitonwose/calendar/compose-multiplatform/maven-metadata.xml&query=(//metadata/versioning/versions/version)[not(contains(text(),%27-%27))][last()])](https://central.sonatype.com/search?q=g:com.kizitonwose.calendar) -[![Multiplatform Library Beta](https://img.shields.io/badge/dynamic/xml.svg?label=Multiplatform%20Library%20Beta&color=slateblue&url=https://repo1.maven.org/maven2/com/kizitonwose/calendar/compose-multiplatform/maven-metadata.xml&query=(//metadata/versioning/versions/version)[contains(text(),%27beta%27)][last()])](https://central.sonatype.com/search?q=g:com.kizitonwose.calendar) **With this library, your calendar will look however you want it to.** @@ -133,7 +131,7 @@ For the compose calendar library, ensure that you are using the library version | 1.4.x | 2.3.x | - | | 1.5.x | 2.4.x | - | | 1.6.x | 2.5.x | 2.5.x | -| 1.7.x | 2.6.x | 2.6.x-beta | +| 1.7.x | 2.6.x | 2.6.x | ## Usage