From 2d6a5cfaa77ad97b03fd8ad6a609ba5627cf11eb Mon Sep 17 00:00:00 2001 From: Himanshu Singh Date: Mon, 5 Jun 2023 19:21:55 +0200 Subject: [PATCH] Bumped Version and moved default functions from internal to publc (#140) --- .github/workflows/run-dokka.yml | 2 +- build.gradle | 6 +++--- kalendar-endlos/build.gradle | 5 +++-- kalendar-endlos/gradle.properties | 2 +- .../himanshoe/kalendar/endlos/ui/color/KalendarColor.kt | 2 +- .../himanshoe/kalendar/endlos/ui/day/KalendarDayKonfig.kt | 2 +- .../kalendar/endlos/ui/header/KalendarTextKonfig.kt | 2 +- kalendar/build.gradle | 7 ++++--- kalendar/gradle.properties | 2 +- .../java/com/himanshoe/kalendar/color/KalendarColor.kt | 2 +- .../kalendar/ui/component/day/KalendarDayKonfig.kt | 2 +- 11 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/run-dokka.yml b/.github/workflows/run-dokka.yml index d8b09843..2b4101a4 100644 --- a/.github/workflows/run-dokka.yml +++ b/.github/workflows/run-dokka.yml @@ -30,7 +30,7 @@ jobs: mv docs/*.md gh-pages/docs - name: Publish Documentation - uses: JamesIves/github-pages-deploy-action@v4.3.3 + uses: JamesIves/github-pages-deploy-action@v4.4.2 with: branch: gh-pages folder: gh-pages \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8558bf9c..10d432c3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { dependencies { - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0" + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0" classpath "org.jlleitschuh.gradle:ktlint-gradle:11.3.2" } } plugins { - id 'com.android.application' version '8.0.1' apply false - id 'com.android.library' version '8.0.0' apply false + id 'com.android.application' version '8.0.2' apply false + id 'com.android.library' version '8.0.2' apply false id 'org.jetbrains.kotlin.android' version '1.8.21' apply false id 'org.jetbrains.dokka' version "1.8.10" } diff --git a/kalendar-endlos/build.gradle b/kalendar-endlos/build.gradle index 464241bc..367aa11f 100644 --- a/kalendar-endlos/build.gradle +++ b/kalendar-endlos/build.gradle @@ -65,9 +65,10 @@ dependencies { //time implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.4.0' lintChecks('com.slack.lint.compose:compose-lint-checks:1.2.0') - implementation "androidx.paging:paging-compose:1.0.0-alpha19" + implementation "androidx.paging:paging-compose:1.0.0-alpha20" + implementation 'androidx.compose.animation:animation' - implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.9.0' testImplementation 'junit:junit:4.13.2' diff --git a/kalendar-endlos/gradle.properties b/kalendar-endlos/gradle.properties index 867563ec..73485fc9 100644 --- a/kalendar-endlos/gradle.properties +++ b/kalendar-endlos/gradle.properties @@ -19,7 +19,7 @@ POM_DESCRIPTION=An Elementary Compose Calendar for Scrolling Calendar. POM_PACKAGING=aar POM_INCEPTION_YEAR=2022 GROUP=com.himanshoe -VERSION_NAME=1.3.1 +VERSION_NAME=1.3.2 VERSION_CODE=1 POM_URL=https://github.com/hi-manshu POM_LICENCE_NAME=The Apache Software License, Version 2.0 diff --git a/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/color/KalendarColor.kt b/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/color/KalendarColor.kt index 5b08f757..5d992958 100644 --- a/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/color/KalendarColor.kt +++ b/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/color/KalendarColor.kt @@ -116,7 +116,7 @@ data class KalendarColors( * * @return The default [KalendarColors] instance. */ - internal fun default(): KalendarColors { + fun default(): KalendarColors { val colors = List(TOTAL_MONTH) { index -> KalendarColor( kalendarBackgroundColor[index], diff --git a/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/day/KalendarDayKonfig.kt b/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/day/KalendarDayKonfig.kt index 161b33ca..6c2ef2c6 100644 --- a/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/day/KalendarDayKonfig.kt +++ b/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/day/KalendarDayKonfig.kt @@ -40,7 +40,7 @@ data class KalendarDayKonfig( ) { companion object { @SuppressWarnings("MagicNumber") - internal fun default() = KalendarDayKonfig( + fun default() = KalendarDayKonfig( size = 56.dp, textSize = 16.sp, textColor = Color(0xFF413D4B), diff --git a/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/header/KalendarTextKonfig.kt b/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/header/KalendarTextKonfig.kt index d9bc9273..efc5a167 100644 --- a/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/header/KalendarTextKonfig.kt +++ b/kalendar-endlos/src/main/java/com/himanshoe/kalendar/endlos/ui/header/KalendarTextKonfig.kt @@ -36,7 +36,7 @@ data class KalendarTextKonfig( * @param color The color of the header text. * @return The default configuration. */ - internal fun default(color: Color) = KalendarTextKonfig( + fun default(color: Color) = KalendarTextKonfig( kalendarTextColor = color, kalendarTextSize = 24.sp ) diff --git a/kalendar/build.gradle b/kalendar/build.gradle index 909b34d9..6b9399f5 100644 --- a/kalendar/build.gradle +++ b/kalendar/build.gradle @@ -49,14 +49,15 @@ mavenPublishing { dependencies { - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.9.0' //Compose implementation platform('androidx.compose:compose-bom:2023.05.01') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' + implementation 'androidx.compose.animation:animation' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3' debugImplementation "androidx.compose.ui:ui-tooling" diff --git a/kalendar/gradle.properties b/kalendar/gradle.properties index 8ee1a46c..aafbbc00 100644 --- a/kalendar/gradle.properties +++ b/kalendar/gradle.properties @@ -19,7 +19,7 @@ POM_DESCRIPTION=An Elementary Compose Calendar. POM_PACKAGING=aar POM_INCEPTION_YEAR=2022 GROUP=com.himanshoe -VERSION_NAME=1.3.1 +VERSION_NAME=1.3.2 VERSION_CODE=1 POM_URL=https://github.com/hi-manshu POM_LICENCE_NAME=The Apache Software License, Version 2.0 diff --git a/kalendar/src/main/java/com/himanshoe/kalendar/color/KalendarColor.kt b/kalendar/src/main/java/com/himanshoe/kalendar/color/KalendarColor.kt index ed15b461..3fc36985 100644 --- a/kalendar/src/main/java/com/himanshoe/kalendar/color/KalendarColor.kt +++ b/kalendar/src/main/java/com/himanshoe/kalendar/color/KalendarColor.kt @@ -113,7 +113,7 @@ data class KalendarColors( * * @return The default [KalendarColors] instance. */ - internal fun default(): KalendarColors { + fun default(): KalendarColors { val colors = List(TOTAL_MONTH) { index -> KalendarColor( kalendarBackgroundColor[index], diff --git a/kalendar/src/main/java/com/himanshoe/kalendar/ui/component/day/KalendarDayKonfig.kt b/kalendar/src/main/java/com/himanshoe/kalendar/ui/component/day/KalendarDayKonfig.kt index d6e01d4d..2a3f5ae2 100644 --- a/kalendar/src/main/java/com/himanshoe/kalendar/ui/component/day/KalendarDayKonfig.kt +++ b/kalendar/src/main/java/com/himanshoe/kalendar/ui/component/day/KalendarDayKonfig.kt @@ -41,7 +41,7 @@ data class KalendarDayKonfig( companion object { @SuppressWarnings("MagicNumber") - internal fun default() = KalendarDayKonfig( + fun default() = KalendarDayKonfig( size = 56.dp, textSize = 16.sp, textColor = Color(0xFF413D4B),