Set default Gradle Version to 8 (#891)

Set default Gradle version to 8

Address review comments

Author: runningcode

CHANGELOG.md

@@ -14,6 +14,10 @@
 
 - Add Google Truth for easier to debug assertions in tests ([#920](https://github.com/getsentry/sentry-android-gradle-plugin/pull/920))
 
+### Dependencies
+
+- Set build default Gradle Version to 8.14.2 ([#891](https://github.com/getsentry/sentry-android-gradle-plugin/pull/891))
+
 ## 5.8.0
 
 ### Dependencies

buildSrc/src/main/java/Dependencies.kt

@@ -1,8 +1,8 @@
-import org.gradle.util.VersionNumber
+import org.gradle.util.internal.VersionNumber
 
 object BuildPluginsVersion {
-    val AGP = System.getenv("VERSION_AGP") ?: "7.4.0"
-    val GROOVY_REDISTRIBUTED = System.getenv("VERSION_GROOVY") ?: "1.2"
+    val AGP = System.getenv("VERSION_AGP") ?: "8.10.1"
+    val GROOVY_REDISTRIBUTED = System.getenv("VERSION_GROOVY") ?: "1.7.1"
 
 	// proguard does not support AGP 8 yet
     fun isProguardApplicable(): Boolean = VersionNumber.parse(AGP).major < 8

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kotlin = "1.8.20"
-agp = "7.4.0"
+agp = "8.10.1"
 
 asm = "9.4" # // compatibility matrix -> https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/instrumentation/InstrumentationContext#apiversion
 ktfmt = "0.51"
@@ -19,7 +19,7 @@ kotlinSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotli
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version = "1.8.10" }
 spotless = { id = "com.diffplug.spotless", version = "7.0.4" }
-groovyGradlePlugin = { id = "dev.gradleplugins.groovy-gradle-plugin", version = "1.2" }
+groovyGradlePlugin = { id = "dev.gradleplugins.groovy-gradle-plugin", version = "1.7.1" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
@@ -33,7 +33,9 @@ proguard = { group = "com.guardsquare", name = "proguard-gradle", version = "7.5
 # this allows us to develop against a fixed version of Gradle, as opposed to depending on the
 # locally available version. kotlin-gradle-plugin follows the same approach.
 # More info: https://docs.nokee.dev/manual/gradle-plugin-development-plugin.html
-gradleApi = { group = "dev.gradleplugins", name = "gradle-api", version = "7.6.4" }
+# The latest version is 8.11.1 https://github.com/gradle-plugins/gradle-api/issues/6
+# 8.8 or higher fails groovy compilation
+gradleApi = { group = "dev.gradleplugins", name = "gradle-api", version = "8.7" }
 agp = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
 kotlinCompilerEmbeddable = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable" }
 autoService = { group = "com.google.auto.service", name = "auto-service", version = "1.0.1" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -192,6 +192,45 @@ tasks.named("distZip") {
   onlyIf { inputs.sourceFiles.isEmpty.not().also { require(it) { "No distribution to zip." } } }
 }
 
+tasks.named("distTar").configure {
+  dependsOn(
+    "dokkaJavadocJar",
+    "jar",
+    "sourcesJar",
+    "generateMetadataFileForPluginMavenPublication",
+    "generatePomFileForPluginMavenPublication",
+  )
+}
+
+tasks.named("sentryJvmPluginMarkerDistTar").configure {
+  dependsOn(
+    "generatePomFileForSentryJvmPluginPluginMarkerMavenPublication",
+    "generatePomFileForKotlinCompilerPluginPluginMarkerMavenPublication",
+  )
+}
+
+tasks.named("sentryJvmPluginMarkerDistZip").configure {
+  dependsOn("generatePomFileForSentryJvmPluginPluginMarkerMavenPublication")
+}
+
+tasks.named("dokkaHtml").configure { dependsOn("compileGroovy") }
+
+tasks.named("sentryKotlinCompilerPluginMarkerDistTar").configure {
+  dependsOn("generatePomFileForKotlinCompilerPluginPluginMarkerMavenPublication")
+}
+
+tasks.named("sentryKotlinCompilerPluginMarkerDistZip").configure {
+  dependsOn("generatePomFileForKotlinCompilerPluginPluginMarkerMavenPublication")
+}
+
+tasks.named("sentryPluginMarkerDistTar").configure {
+  dependsOn("generatePomFileForSentryPluginPluginMarkerMavenPublication")
+}
+
+tasks.named("sentryPluginMarkerDistZip").configure {
+  dependsOn("generatePomFileForSentryPluginPluginMarkerMavenPublication")
+}
+
 tasks.withType<Test>().configureEach {
   testLogging {
     events = setOf(TestLogEvent.SKIPPED, TestLogEvent.PASSED, TestLogEvent.FAILED)

gradlew

@@ -1,7 +1,6 @@
 plugins {
   `kotlin-dsl`
   id("java-gradle-plugin")
-  kotlin("jvm") version "1.8.20"
 }
 
 repositories { mavenCentral() }

gradlew.bat

@@ -1,3 +1,3 @@
 dependencyResolutionManagement {
-  versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
+  versionCatalogs { create("libs") { from(files("../../gradle/libs.versions.toml")) } }
 }