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

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,26 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,16 +200,20 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -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 ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -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)

plugin-build/build.gradle.kts

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

plugin-build/buildSrc/build.gradle.kts

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

plugin-build/buildSrc/settings.gradle.kts

@@ -6,6 +6,7 @@ dependencyResolutionManagement {
     google()
     mavenLocal()
   }
+  versionCatalogs.create("libs") { from(files("../gradle/libs.versions.toml")) }
 
   repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
 }

plugin-build/gradle/libs.versions.toml

@@ -15,6 +15,7 @@ fun createTestAndroidProject(
   val appExtension =
     project.extensions.getByType(AppExtension::class.java).apply {
       compileSdkVersion(30)
+      namespace = "com.example.app"
       this.block()
     }
   if (forceEvaluate) {
@@ -33,6 +34,7 @@ fun createTestProguardProject(
   val appExtension =
     project.extensions.getByType(AppExtension::class.java).apply {
       compileSdkVersion(30)
+      namespace = "com.example.app"
       this.block()
     }
   project.plugins.apply("com.guardsquare.proguard")

plugin-build/gradle/wrapper

@@ -2,7 +2,6 @@ package io.sentry.android.gradle.util
 
 import io.sentry.android.gradle.retrieveAndroidVariant
 import io.sentry.android.gradle.testutil.createTestAndroidProject
-import io.sentry.android.gradle.testutil.createTestProguardProject
 import io.sentry.android.gradle.util.SentryPluginUtils.capitalizeUS
 import io.sentry.android.gradle.util.SentryPluginUtils.getAndDeleteFile
 import io.sentry.android.gradle.util.SentryPluginUtils.isMinificationEnabled
@@ -14,7 +13,6 @@ import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
-import proguard.gradle.plugin.android.dsl.ProGuardAndroidExtension
 
 @RunWith(Parameterized::class)
 class SentryPluginUtilsTest(private val agpVersion: SemVer) {
@@ -36,36 +34,6 @@ class SentryPluginUtilsTest(private val agpVersion: SemVer) {
     assertEquals("", "".capitalizeUS())
   }
 
-  @Test
-  fun `isMinificationEnabled returns false for standalone Proguard`() {
-    val (project, _) = createTestProguardProject(forceEvaluate = !AgpVersions.isAGP74(agpVersion))
-    val variant = project.retrieveAndroidVariant("debug")
-
-    assertEquals(false, isMinificationEnabled(project, variant, dexguardEnabled = true))
-  }
-
-  @Test
-  fun `isMinificationEnabled returns true for standalone Proguard and valid config`() {
-    val (project, _) = createTestProguardProject(forceEvaluate = !AgpVersions.isAGP74(agpVersion))
-    project.extensions.getByType(ProGuardAndroidExtension::class.java).apply {
-      configurations.create("debug") { it.defaultConfiguration("proguard-android-optimize.txt") }
-    }
-    val variant = project.retrieveAndroidVariant("debug")
-
-    assertEquals(true, isMinificationEnabled(project, variant, dexguardEnabled = true))
-  }
-
-  @Test
-  fun `isMinificationEnabled returns false for standalone Proguard without opt-in`() {
-    val (project, _) = createTestProguardProject(forceEvaluate = !AgpVersions.isAGP74(agpVersion))
-    project.extensions.getByType(ProGuardAndroidExtension::class.java).apply {
-      configurations.create("debug") { it.defaultConfiguration("proguard-android-optimize.txt") }
-    }
-    val variant = project.retrieveAndroidVariant("debug")
-
-    assertEquals(false, isMinificationEnabled(project, variant, dexguardEnabled = false))
-  }
-
   @Test
   fun `isMinificationEnabled returns false for debug builds`() {
     val (project, _) = createTestAndroidProject(forceEvaluate = !AgpVersions.isAGP74(agpVersion))