Skip to content

Commit

Permalink
Update dependencies, kotlin and include modifier param in FloatingButton
Browse files Browse the repository at this point in the history
  • Loading branch information
jeluchu committed May 27, 2024
1 parent b8ad5f6 commit 397e596
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ android {
}

buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = "1.5.13"
composeOptions.kotlinCompilerExtensionVersion = "1.5.14"
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ plugins {
id("org.jetbrains.dokka") version "1.9.20" apply true
}

val currentVersion = "2.0.0-alpha10"
val currentVersion = "2.0.0-alpha11"
val previousVersionsDirectory = project.rootProject.projectDir.resolve("previousDocVersions").invariantSeparatorsPath

tasks.dokkaHtmlMultiModule {
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[versions]
androidx-activity = "1.9.0"
androidx-compose = "1.6.7"
androidx-lifecycle = "2.7.0"
androidx-lifecycle = "2.8.0"
androidx-navigation = "2.7.7"
com-google-accompanist = "0.32.0"
com-squareup-okhttp3 = "4.12.0"
com-squareup-retrofit2 = "2.11.0"
coil-kt = "2.6.0"
coil-gif = "2.5.0"
org-jetbrains-kotlin = "1.9.23"
org-jetbrains-kotlinx = "1.8.0"
org-jetbrains-kotlin = "1.9.24"
org-jetbrains-kotlinx = "1.8.1"

[libraries]
androidx-datastore = "androidx.datastore:datastore-preferences:1.1.1"
Expand All @@ -32,12 +32,12 @@ androidx-lifecycle-lifecycle-livedata-core-ktx = { module = "androidx.lifecycle:
androidx-lifecycle-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
androidx-navigation-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
androidx-preference = "androidx.preference:preference-ktx:1.2.1"
com-android-tools-build-gradle = "com.android.tools.build:gradle:8.4.0"
com-android-tools-build-gradle = "com.android.tools.build:gradle:8.4.1"
org-jetbrains-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20"
org-jetbrains-dokka-versioning = "org.jetbrains.dokka:versioning-plugin:1.9.20"
com-google-accompanist-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "com-google-accompanist" }
com-google-android-gms-play-services-base = "com.google.android.gms:play-services-base:18.4.0"
com-google-code-gson = "com.google.code.gson:gson:2.10.1"
com-google-code-gson = "com.google.code.gson:gson:2.11.0"
com-squareup-okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "com-squareup-okhttp3" }
com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
com-squareup-retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "com-squareup-retrofit2" }
Expand Down
2 changes: 1 addition & 1 deletion jchucomponents-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ afterEvaluate {
from components.release
groupId = "com.github.jeluchu"
artifactId = "jchucomponents-core"
version = "2.0.0-alpha10"
version = "2.0.0-alpha11"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions jchucomponents-ktx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
}

buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = "1.5.13"
composeOptions.kotlinCompilerExtensionVersion = "1.5.14"

buildTypes {
release {
Expand Down Expand Up @@ -46,7 +46,7 @@ afterEvaluate {
from components.release
groupId = "com.github.jeluchu"
artifactId = "jchucomponents-ktx"
version = "2.0.0-alpha10"
version = "2.0.0-alpha11"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions jchucomponents-prefs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
}

buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = "1.5.13"
composeOptions.kotlinCompilerExtensionVersion = "1.5.14"

buildTypes {
release {
Expand Down Expand Up @@ -47,7 +47,7 @@ afterEvaluate {
from components.release
groupId = "com.github.jeluchu"
artifactId = "jchucomponents-prefs"
version = "2.0.0-alpha10"
version = "2.0.0-alpha11"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jchucomponents-qr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ afterEvaluate {
from components.release
groupId = "com.github.jeluchu"
artifactId = "jchucomponents-qr"
version = "2.0.0-alpha10"
version = "2.0.0-alpha11"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions jchucomponents-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
}

buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = "1.5.13"
composeOptions.kotlinCompilerExtensionVersion = "1.5.14"

buildTypes {
release {
Expand Down Expand Up @@ -49,7 +49,7 @@ afterEvaluate {
from components.release
groupId = "com.github.jeluchu"
artifactId = "jchucomponents-ui"
version = "2.0.0-alpha10"
version = "2.0.0-alpha11"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import com.jeluchu.jchucomponents.ui.themes.cosmicLatte

@Composable
fun FloatingButton(
modifier: Modifier = Modifier,
enabled: Boolean = true,
isVisible: Boolean = true,
exit: ExitTransition = scaleOut(),
Expand All @@ -55,7 +56,7 @@ fun FloatingButton(
exit = exit
) {
FloatingActionButton(
modifier = Modifier.size(size.buttonSize),
modifier = modifier.size(size.buttonSize),
containerColor = if (enabled) floatButton.background else floatButton.disabledBackground,
elevation = FloatingActionButtonDefaults.elevation(
defaultElevation = 0.dp,
Expand All @@ -74,7 +75,7 @@ fun FloatingButton(
}

@Immutable
class FloatingButtonSettings constructor(
class FloatingButtonSettings(
@DrawableRes val icon: Int = R.drawable.ic_btn_share,
val tint: Color = cosmicLatte,
val background: Color = artichoke,
Expand Down

0 comments on commit 397e596

Please sign in to comment.