Skip to content

Commit

Permalink
build: Deps upgrade, Gradle 8.9, AGP 8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Lastaapps committed Jul 12, 2024
1 parent d53cd43 commit e905755
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 36 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ local.properties
/gradle/libs.versions.updates.toml
/.idea/other.xml
.kotlin
/.idea/studiobot.xml
46 changes: 22 additions & 24 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
[versions]
aboutLibraries = "11.1.4"
android-gradle = "8.3.2"
aboutLibraries = "11.2.2"
android-gradle = "8.5.1"
androidx-activity = "1.9.0"
androidx-compose = "1.7.0-beta01"
androidx-compose-material = "1.7.0-beta01"
androidx-compose-material3 = "1.3.0-beta01"
androidx-lifecycle = "2.8.0"
androidx-compose = "1.7.0-beta05"
androidx-compose-material = "1.7.0-beta05"
androidx-compose-material3 = "1.3.0-beta04"
androidx-lifecycle = "2.8.3"
androidx-security = "1.1.0-alpha06"
androidx-test = "1.5.0"
coil = "3.0.0-alpha06"
decompose = "3.0.0"
detekt = "1.23.4"
espresso = "3.5.1"
google-ksp = "1.9.24-1.0.20"
androidx-test = "1.6.1"
coil = "3.0.0-alpha07"
decompose = "3.1.0"
detekt = "1.23.6"
espresso = "3.6.1"
google-ksp = "2.0.0-1.0.23"
# @keep
java-jvmTarget = "17"
junit5-bom = "5.10.1"
kermit = "2.0.3"
kermit = "2.0.4"
koin = "3.5.6"
koin-annotations = "1.0.3"
kotest = "5.8.0"
kotest = "5.9.0"
kotlin = "2.0.0"
# @keep
kotlin-api = "2.0"
# @keep
kotlin-language = "2.0"
kotlinx-atomicfu = "0.24.0"
kotlinx-coroutines = "1.8.1"
ktlint = "11.6.0"
ktor = "2.3.11"
kotlinx-atomicfu = "0.25.0"
kotlinx-coroutines = "1.9.0-RC"
ktlint = "12.1.1"
ktor = "2.3.12"
russhwolf-settings = "1.1.1"
sdk-compile = "34"
sdk-min = "21"
Expand All @@ -43,8 +43,8 @@ android-desugaring = "com.android.tools:desugar_jdk_libs:2.0.4"
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
androidx-activity-core = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
androidx-annotation = "androidx.annotation:annotation:1.8.0"
androidx-appcompat = "androidx.appcompat:appcompat:1.7.0-rc01"
androidx-collection = "androidx.collection:collection:1.4.0"
androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
androidx-collection = "androidx.collection:collection:1.4.1"
androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "androidx-compose" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
androidx-compose-iconsCore = { module = "androidx.compose.material:material-icons-core", version.ref = "androidx-compose-material" }
Expand Down Expand Up @@ -76,7 +76,7 @@ androidx-test-runner = { module = "androidx.test:runner-ktx", version.ref = "and
androidx-test-truth = { module = "androidx.test.ext:truth-ktx", version.ref = "androidx-test" }
androidx-tracing = "androidx.tracing:tracing-ktx:1.2.0"
androidx-vectorDrawables = "androidx.vectordrawable:vectordrawable:1.2.0"
androidx-windowManager = "androidx.window:window:1.2.0"
androidx-windowManager = "androidx.window:window:1.3.0"
androidx-work = "androidx.work:work-runtime-ktx:2.9.0"
arrowkt-bom = "io.arrow-kt:arrow-stack:1.2.4"
arrowkt-core = { module = "io.arrow-kt:arrow-core" }
Expand Down Expand Up @@ -139,7 +139,7 @@ kotlinx-coroutines-common = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
kotlinx-dateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.0"
kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"
ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
Expand All @@ -161,7 +161,6 @@ ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
ktor-server-defaultHeaders = { module = "io.ktor:ktor-server-default-headers", version.ref = "ktor" }
ktor-server-forwardedHeaders = { module = "io.ktor:ktor-server-forwarded-header", version.ref = "ktor" }
ktor-server-httpRedirect = { module = "io.ktor:ktor-server-http-redirect", version.ref = "ktor" }
ktor-server-jsonSerialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
ktor-server-partialContent = { module = "io.ktor:ktor-server-partial-content", version.ref = "ktor" }
ktor-server-sesstions = { module = "io.ktor:ktor-server-sessions", version.ref = "ktor" }
Expand Down Expand Up @@ -198,7 +197,6 @@ ktor-server = [
"ktor-server-defaultHeaders",
"ktor-server-forwardedHeaders",
"ktor-server-httpRedirect",
"ktor-server-jsonSerialization",
"ktor-server-partialContent",
"ktor-server-sesstions",
"ktor-server-statusPages",
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
Expand Up @@ -19,7 +19,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
26 changes: 15 additions & 11 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
#
# 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 file is part of Menza.
#
# https://www.apache.org/licenses/LICENSE-2.0
# Menza 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.
#
# 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.
# Menza 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 Menza. If not, see <https://www.gnu.org/licenses/>.
#

##############################################################################
Expand Down Expand Up @@ -84,7 +87,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 e905755

Please sign in to comment.