diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73db945c1..f3d4c3d27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,6 @@ jobs: local_test_job: name: Running local tests runs-on: ubuntu-latest - continue-on-error: true steps: - name: Checkout uses: actions/checkout@v2 @@ -44,7 +43,6 @@ jobs: build_job: name: Building the APK runs-on: ubuntu-latest - continue-on-error: true steps: - name: Checkout uses: actions/checkout@v2 diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar index d2254a036..29dee4e9c 100644 Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ diff --git a/build-tools/builder-model-impl/build.gradle b/build-tools/builder-model-impl/build.gradle index e48c4c189..2ed972db7 100644 --- a/build-tools/builder-model-impl/build.gradle +++ b/build-tools/builder-model-impl/build.gradle @@ -39,5 +39,5 @@ compileTestKotlin { dependencies { implementation common.jkotlin - api "com.android.tools.build:builder-model:${project.property ("androidide.tooling.supportedAgpVersion")}" + api "com.android.tools.build:builder-model:7.3.0" } \ No newline at end of file diff --git a/build-tools/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt b/build-tools/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt index e8a24f4f0..43431f1fd 100644 --- a/build-tools/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt +++ b/build-tools/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt @@ -26,7 +26,7 @@ class DefaultVariant : Variant, Serializable { override var androidTestArtifact: DefaultAndroidArtifact? = null override var displayName: String = "" override var isInstantAppCompatible: Boolean = false - var desugaredMethods: List = emptyList() + override var desugaredMethods: List = emptyList() override var mainArtifact: DefaultAndroidArtifact = DefaultAndroidArtifact() override var name: String = "" override var testFixturesArtifact: DefaultAndroidArtifact? = null diff --git a/build-tools/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt b/build-tools/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt index 7f9a159d1..6ba1e4590 100644 --- a/build-tools/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt +++ b/build-tools/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt @@ -20,28 +20,32 @@ package com.itsaky.androidide.tooling.impl import com.android.builder.model.v2.ide.LibraryType.PROJECT import com.android.builder.model.v2.ide.ProjectType.APPLICATION import com.google.common.truth.Truth.assertThat -import com.google.gson.GsonBuilder +import com.itsaky.androidide.tooling.api.IProject import com.itsaky.androidide.tooling.api.IProject.Type.Gradle +import com.itsaky.androidide.tooling.api.IToolingApiServer import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage import com.itsaky.androidide.tooling.api.model.AndroidModule import com.itsaky.androidide.tooling.api.model.JavaModule import com.itsaky.androidide.tooling.api.model.JavaModuleExternalDependency import com.itsaky.androidide.tooling.api.model.JavaModuleProjectDependency -import com.itsaky.androidide.tooling.api.util.ToolingApiLauncher import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher -import java.io.File import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import java.io.File /** @author Akash Yadav */ @RunWith(JUnit4::class) class MultiModuleAndroidProjectTest { @Test - fun testProjectInit() { - val (server, project) = ToolingApiTestLauncher().launchServer() + fun `test simple multi module project initialization`() { + val (server, project) = ToolingApiTestLauncher().launchServer(client = MultiVersionTestClient()) server.initialize(InitializeProjectMessage(File("../../tests/test-project").absolutePath)).get() + doAssertions(project, server) + } + + private fun doAssertions(project: IProject, server: IToolingApiServer) { assertThat(project).isNotNull() assertThat(project.type.get()).isEqualTo(Gradle) // As the returned project is just a proxy, @@ -51,10 +55,6 @@ class MultiModuleAndroidProjectTest { val app = project.findByPath(":app").get() assertThat(app).isNotNull() assertThat(app).isInstanceOf(AndroidModule::class.java) - GsonBuilder().apply { - ToolingApiLauncher.configureGson(this) - println(create().toJson(app)) - } assertThat((app as AndroidModule).javaCompileOptions).isNotNull() assertThat(app.javaCompileOptions.sourceCompatibility).isEqualTo("11") assertThat(app.javaCompileOptions.targetCompatibility).isEqualTo("11") @@ -133,7 +133,53 @@ class MultiModuleAndroidProjectTest { assertThat(anotherJavaLib).isInstanceOf(JavaModule::class.java) assertThat((anotherJavaLib as JavaModule).compilerSettings.javaSourceVersion).isEqualTo("1.8") assertThat(anotherJavaLib.compilerSettings.javaBytecodeVersion).isEqualTo("1.8") + } - server.shutdown().get() + /** + * Tests the functionality of the tooling API implementation against multiple versions of the + * Android Gradle Plugin. This test runs only in the CI environment. + */ + @Test + fun `test CI-only simple multi module project initialization with multiple AGP versions`() { + val isCi = System.getenv("CI").let { it == "true" } + if (!isCi) { + println("Skipping project initialization test with multiple AGP versions") + println("This test is supposed to run only in CI environment") + return + } + + val versions = listOf("7.2.0", "7.2.1", "7,2,2", "7.3.0") + val client = MultiVersionTestClient() + for (version in versions) { + client.version = version + val (server, project) = ToolingApiTestLauncher().launchServer(client = client) + server + .initialize(InitializeProjectMessage(File("../../tests/test-project").absolutePath)) + .get() + doAssertions(project = project, server = server) + server.shutdown().get() + MultiVersionTestClient.buildFile.delete() + } + } + + class MultiVersionTestClient(var version: String = "7.2.0") : + ToolingApiTestLauncher.TestClient() { + + companion object { + val buildTemplateFile = File("../../tests/test-project/build.gradle.in") + val buildFile = File(buildTemplateFile.parentFile, "build.gradle") + } + + override fun prepareBuild() { + super.prepareBuild() + var contents = buildTemplateFile.bufferedReader().readText() + contents = contents.replace("@@TOOLING_API_TEST_AGP_VERSION@@", this.version) + contents = "/* DO NOT EDIT - Automatically generated file */\n${contents.trim()}" + val writer = buildFile.bufferedWriter() + writer.use { + it.write(contents) + it.flush() + } + } } } diff --git a/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/AndroidModule.kt b/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/AndroidModule.kt index 8382a0929..4641bd8d3 100644 --- a/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/AndroidModule.kt +++ b/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/AndroidModule.kt @@ -59,7 +59,7 @@ open class AndroidModule( override val variants: Collection = emptyList(), override val viewBindingOptions: DefaultViewBindingOptions?, override val lintChecksJars: List, - val modelSyncFiles: List, + override val modelSyncFiles: List, val simpleVariants: MutableList = mutableListOf() ) : IdeGradleProject(name, description, path, projectDir, buildDir, buildScript, parent, tasks), diff --git a/build-tools/tooling-api-testing/src/main/java/com/itsaky/androidide/tooling/testing/ToolingApiTestLauncher.kt b/build-tools/tooling-api-testing/src/main/java/com/itsaky/androidide/tooling/testing/ToolingApiTestLauncher.kt index 90c38160c..bfff2ca7a 100644 --- a/build-tools/tooling-api-testing/src/main/java/com/itsaky/androidide/tooling/testing/ToolingApiTestLauncher.kt +++ b/build-tools/tooling-api-testing/src/main/java/com/itsaky/androidide/tooling/testing/ToolingApiTestLauncher.kt @@ -92,7 +92,7 @@ class ToolingApiTestLauncher { } } - class TestClient : IToolingApiClient { + open class TestClient : IToolingApiClient { private val log = ILogger.newInstance(javaClass.simpleName) override fun logMessage(line: LogLine) { log.log(line.priority, line.formattedTagAndMessage()) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..41d9927a4 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 863880123..ae04661ee 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 53903f623..1b6c78733 100755 --- a/gradlew +++ b/gradlew @@ -1,6 +1,7 @@ -#!/usr/bin/env bash +#!/bin/sh + # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # 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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -86,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -105,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + 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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/tests/test-home/.androidide/init/model.jar b/tests/test-home/.androidide/init/model.jar index 35972fa1e..968931cf5 100644 Binary files a/tests/test-home/.androidide/init/model.jar and b/tests/test-home/.androidide/init/model.jar differ diff --git a/tests/test-project/app/proguard-rules.pro b/tests/test-project/app/proguard-rules.pro index 7cb931b80..f1008c462 100644 --- a/tests/test-project/app/proguard-rules.pro +++ b/tests/test-project/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle.kts. +# proguardFiles setting in build.gradle.in.kts. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html diff --git a/tests/test-project/build.gradle b/tests/test-project/build.gradle index 483f6ce86..1cce8e94d 100644 --- a/tests/test-project/build.gradle +++ b/tests/test-project/build.gradle @@ -1,6 +1,7 @@ buildscript { ext { - build_gradle_version = '7.4.0-alpha05' + build_gradle_version = "7.2.0" + println ("Build Gradle version: '${build_gradle_version}'") } project.ext { diff --git a/tests/test-project/build.gradle.in b/tests/test-project/build.gradle.in new file mode 100644 index 000000000..6c9648392 --- /dev/null +++ b/tests/test-project/build.gradle.in @@ -0,0 +1,36 @@ +buildscript { + ext { + build_gradle_version = "@@TOOLING_API_TEST_AGP_VERSION@@" + } + + project.ext { + compileSdk = 31 + buildTools = "31.0.0" + appId = "com.itsaky.test.app" + minSdk = 21 + targetSdk = 32 + versionCode = 100 + versionName = "1.0.0" + } + + repositories { + google () + mavenLocal () + mavenCentral () + } + dependencies { + classpath "com.android.tools.build:gradle:$build_gradle_version" + } + +} +allprojects { + repositories { + mavenLocal () + mavenCentral () + google () + } +} + +task clean (type: Delete) { + delete rootProject.buildDir +} diff --git a/tests/test-project/gradle/wrapper/gradle-wrapper.properties b/tests/test-project/gradle/wrapper/gradle-wrapper.properties index cee90b37d..d3ea086bc 100644 --- a/tests/test-project/gradle/wrapper/gradle-wrapper.properties +++ b/tests/test-project/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists