Skip to content

Commit

Permalink
chore: update Compose BOM (#456)
Browse files Browse the repository at this point in the history
* chore: update Compose BOM

* chore: update Gradle wrapper
  • Loading branch information
svenjacobs authored Sep 8, 2024
1 parent 08854cc commit f64975f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 36 deletions.
3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ android {
}

composeCompiler {
enableStrongSkippingMode = true
}

play {
Expand All @@ -119,7 +118,7 @@ play {
}

dependencies {
val composeBom = platform(libs.chrisbanes.compose.bom.alpha)
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
implementation(platform(libs.kotlin.bom))

Expand Down
3 changes: 1 addition & 2 deletions buildSrc/src/main/kotlin/android-library.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,12 @@ android {
}

composeCompiler {
enableStrongSkippingMode = true
}

dependencies {
api(project(":core-common"))

val composeBom = platform(libs.findLibrary("chrisbanes.compose.bom.alpha").get())
val composeBom = platform(libs.findLibrary("androidx.compose.bom").get())
api(composeBom)
api(platform(libs.findLibrary("kotlin.bom").get()))

Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
android-gradle-plugin = "8.6.0"
androidx-activity = "1.9.2"
androidx-compose-bom = "2024.08.00" # https://developer.android.com/jetpack/compose/bom/bom-mapping
androidx-compose-bom = "2024.09.00" # https://developer.android.com/jetpack/compose/bom/bom-mapping
androidx-lifecycle = "2.8.5"
kotest = "5.9.1"
kotlin = "2.0.20"
Expand All @@ -28,7 +28,6 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
androidx-navigation-compose = "androidx.navigation:navigation-compose:2.8.0"
androidx-startup-runtime = "androidx.startup:startup-runtime:1.1.1"
chrisbanes-compose-bom-alpha = "dev.chrisbanes.compose:compose-bom:2024.08.00-alpha02"
facebook-stetho = "com.facebook.stetho:stetho:1.6.0"
jakewharton-timber = "com.jakewharton.timber:timber:5.0.1"
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
19 changes: 1 addition & 18 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
#
# Léon - The URL Cleaner
# Copyright (C) 2024 Sven Jacobs
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
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.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
22 changes: 10 additions & 12 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
#!/bin/sh

#
# Léon - The URL Cleaner
# Copyright (C) 2024 Sven Jacobs
# Copyright © 2015-2021 the original authors.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# https://www.apache.org/licenses/LICENSE-2.0
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
Expand Down

0 comments on commit f64975f

Please sign in to comment.