Skip to content

Commit 0408c15

Browse files
committed
Update Gradle and dependencies
1 parent a4e722a commit 0408c15

4 files changed

Lines changed: 22 additions & 8 deletions

File tree

app/build.gradle.kts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,39 @@ android {
2121
buildTypes {
2222
release {
2323
isMinifyEnabled = false
24+
isShrinkResources = false
2425
proguardFiles(
2526
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
2627
)
2728
}
2829
}
2930

3031
compileOptions {
31-
sourceCompatibility = JavaVersion.VERSION_18
32-
targetCompatibility = JavaVersion.VERSION_18
32+
sourceCompatibility = JavaVersion.VERSION_21
33+
targetCompatibility = JavaVersion.VERSION_21
3334
}
3435

3536
kotlin {
3637
compilerOptions {
37-
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_18)
38+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
3839
}
3940
}
4041

4142
buildFeatures {
4243
viewBinding = true
4344
}
45+
46+
dependenciesInfo {
47+
includeInApk = false
48+
includeInBundle = false
49+
}
50+
51+
aboutLibraries {
52+
library {
53+
duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
54+
duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.SIMPLE
55+
}
56+
}
4457
}
4558

4659
dependencies {

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ kotlin = "2.2.20"
44
kotlinReflect = "2.2.0"
55
preference = "1.2.1"
66
appcompat = "1.7.1"
7-
navigation = "2.9.4"
7+
navigation = "2.9.5"
88
splashScreen = "1.0.1"
9-
material = "1.14.0-alpha04"
10-
aboutLibraries = "12.2.4"
9+
material = "1.14.0-alpha05"
10+
aboutLibraries = "13.0.0"
1111

1212
[libraries]
1313
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinReflect"}
@@ -21,4 +21,4 @@ aboutlibraries-view = { module = "com.mikepenz:aboutlibraries", version.ref = "a
2121
[plugins]
2222
android-application = { id = "com.android.application", version.ref = "agp" }
2323
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
24-
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" }
24+
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutLibraries" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed May 21 00:03:22 BRT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pluginManagement {
1313
gradlePluginPortal()
1414
}
1515
}
16+
1617
dependencyResolutionManagement {
1718
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1819
repositories {

0 commit comments

Comments
 (0)