Skip to content

Commit

Permalink
chore: upgrade Gradle, AGP, Activity, Core, Fragment, Lifecycle, Pagi…
Browse files Browse the repository at this point in the history
…ng, Desugar libs, Hilt, Kotlin, Coroutines, KSP
  • Loading branch information
cbeyls committed Dec 3, 2024
1 parent dd441e9 commit 298b7d1
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

android {
namespace = "be.digitalia.fosdem"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "be.digitalia.fosdem"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/be/digitalia/fosdem/utils/StringUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ private class ListsTagHandler(res: Resources) : TagHandler {
// Unfortunately the following code will be ignored in API 24+ and the native rendering is inferior
"li", "LI" -> if (opening) {
liStarts.addLast(ensureParagraphBoundary(output))
} else if (!liStarts.isEmpty) {
} else if (!liStarts.isEmpty()) {
val start = liStarts.popLast()
trimStart(output, start)
val end = ensureParagraphBoundary(output)
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[versions]
androidGradlePlugin = "8.5.2"
androidx-activity = "1.9.1"
androidGradlePlugin = "8.7.3"
androidx-activity = "1.9.3"
androidx-appcompat = "1.7.0"
androidx-browser = "1.8.0"
androidx-coordinatorlayout = "1.2.0"
androidx-core = "1.13.1"
androidx-core = "1.15.0"
androidx-datastore = "1.1.1"
androidx-drawerlayout = "1.2.0"
androidx-fragment = "1.8.2"
androidx-lifecycle = "2.8.4"
androidx-paging = "3.3.2"
androidx-fragment = "1.8.5"
androidx-lifecycle = "2.8.7"
androidx-paging = "3.3.4"
androidx-preference = "1.2.1"
androidx-recyclerview = "1.3.2"
androidx-room = "2.6.1"
androidx-viewpager2 = "1.1.0"
desugarJdkLibs = "2.0.4"
hilt = "2.52"
kotlin = "2.0.10"
kotlinx-coroutines = "1.8.1"
ksp = "2.0.10-1.0.24"
desugarJdkLibs = "2.1.3"
hilt = "2.53"
kotlin = "2.0.21"
kotlinx-coroutines = "1.9.0"
ksp = "2.0.21-1.0.28"
material = "1.12.0"
moshi = "1.15.1"
okhttp = "4.12.0"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit 298b7d1

Please sign in to comment.