Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Version Catalog #14713

Merged
merged 3 commits into from
Apr 2, 2025
Merged

Migrate to Version Catalog #14713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ac54f6
start migration
alperozturk96 Mar 20, 2025
7044156
add license header
alperozturk96 Mar 20, 2025
029250d
update license header
alperozturk96 Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import org.gradle.internal.jvm.Jvm
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$androidPluginVersion"
classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7"
classpath libs.spotbugs.gradle.plugin
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
Expand All @@ -28,7 +28,7 @@ buildscript {
}

plugins {
id "org.jetbrains.kotlin.plugin.compose" version "2.1.10"
alias(libs.plugins.kotlin.compose)
id "com.diffplug.spotless" version "6.25.0"
id "org.jetbrains.kotlin.kapt" version "2.1.10"
id "com.google.devtools.ksp" version "2.1.10-1.0.31" apply false
Expand Down Expand Up @@ -273,12 +273,12 @@ dependencies {
}

// Jetpack Compose
implementation(platform("androidx.compose:compose-bom:2025.02.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.material3:material3")
debugImplementation("androidx.compose.ui:ui-tooling")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.material3)
debugImplementation(libs.androidx.ui.tooling)
implementation(libs.androidx.ui.tooling.preview)

compileOnly "org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2"
// remove after entire switch to lib v2
Expand Down Expand Up @@ -429,7 +429,7 @@ dependencies {
implementation "io.coil-kt:coil:2.7.0"

// splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
implementation "androidx.core:core-splashscreen:1.0.1"
implementation libs.androidx.core.splashscreen
}

configurations.configureEach {
Expand Down
23 changes: 23 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

[versions]
splash-screen = "1.0.1"
kotlin = "2.1.10"
composeBom = "2025.03.00"
spotbugsGradlePlugin = "6.1.7"

[libraries]
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splash-screen" }

# Jetpack Compose
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
androidx-ui = { module = "androidx.compose.ui:ui" }
androidx-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
material3 = { module = "androidx.compose.material3:material3" }
spotbugs-gradle-plugin = { module = "com.github.spotbugs.snom:spotbugs-gradle-plugin", version.ref = "spotbugsGradlePlugin" }

[plugins]
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5 changes: 5 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,11 @@
<sha256 value="cb3cd5c41bd791372c44cdd13646eea042d768b4b8652e1b72fdfb81c2d42745" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose" name="compose-bom" version="2025.03.00">
<artifact name="compose-bom-2025.03.00.pom">
<sha256 value="26c308b484e195aabdb1846249c4d44f297ff086219f05a3ff263f9b32ed0d86" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose.animation" name="animation" version="1.7.5">
<artifact name="animation-1.7.5.module">
<sha256 value="7c742bb407497fb4c322bd3d4abef83741ea6107a12168f579438303433497ff" origin="Generated by Gradle"/>
Expand Down
Loading