Skip to content

Commit 59683a4

Browse files
committed
[DNM] Just testing setting default Gradle version to 8
1 parent da300f2 commit 59683a4

6 files changed

Lines changed: 43 additions & 33 deletions

File tree

buildSrc/src/main/java/Dependencies.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import org.gradle.util.VersionNumber
22

33
object BuildPluginsVersion {
4-
val AGP = System.getenv("VERSION_AGP") ?: "7.4.0"
5-
val GROOVY_REDISTRIBUTED = System.getenv("VERSION_GROOVY") ?: "1.2"
4+
val AGP = System.getenv("VERSION_AGP") ?: "8.8.1"
5+
val GROOVY_REDISTRIBUTED = System.getenv("VERSION_GROOVY") ?: "1.7.1"
66

77
// proguard does not support AGP 8 yet
88
fun isProguardApplicable(): Boolean = VersionNumber.parse(AGP).major < 8
@@ -16,7 +16,7 @@ object LibsVersion {
1616
object Libs {
1717
fun agp(version: String) = "com.android.tools.build:gradle:$version"
1818
val AGP = "com.android.tools.build:gradle:${BuildPluginsVersion.AGP}"
19-
const val PROGUARD = "com.guardsquare:proguard-gradle:7.1.0"
19+
const val PROGUARD = "com.guardsquare:proguard-gradle:7.5.0"
2020
}
2121

2222
object CI {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
kotlin = "1.8.20"
3-
agp = "7.4.0"
3+
agp = "8.8.1"
44

55
asm = "9.4" # // compatibility matrix -> https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/instrumentation/InstrumentationContext#apiversion
66
ktfmt = "0.51"
@@ -19,7 +19,7 @@ kotlinSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotli
1919
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
2020
dokka = { id = "org.jetbrains.dokka", version = "1.8.10" }
2121
spotless = { id = "com.diffplug.spotless", version = "7.0.0" }
22-
groovyGradlePlugin = { id = "dev.gradleplugins.groovy-gradle-plugin", version = "1.2" }
22+
groovyGradlePlugin = { id = "dev.gradleplugins.groovy-gradle-plugin", version = "1.7.1" }
2323
shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
2424
# do not upgrade `mavenPublish` to 0.18.0, it does not generate the pom-default.xml and module.json under
2525
# build/publications/maven

gradle/wrapper/gradle-wrapper.jar

-17.4 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 22 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)