Skip to content

Commit

Permalink
Merge pull request #547 from gradle/asodja/maintenance
Browse files Browse the repository at this point in the history
Update wrapper and Develocity plugin
  • Loading branch information
asodja authored Mar 22, 2024
2 parents c5b6e32 + 2ed5895 commit ab1775e
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 39 deletions.
5 changes: 2 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,8 @@ androidStudioTests {
val autoDownloadAndRunInHeadless = providers.gradleProperty("autoDownloadAndRunInHeadless").orNull == "true"
runAndroidStudioInHeadlessMode.set(autoDownloadAndRunInHeadless)
autoDownloadAndroidStudio.set(autoDownloadAndRunInHeadless)
// Iguana (2023.2.1.7) Canary 7
testAndroidStudioVersion.set("2023.2.1.7")
testAndroidSdkVersion.set("7.3.0")
testAndroidStudioVersion.set(libs.versions.testAndroidStudioVersion)
testAndroidSdkVersion.set(libs.versions.testAndroidSdkVersion)
// For local development it's easier to setup Android SDK with Android Studio, since auto download needs ANDROID_HOME or ANDROID_SDK_ROOT
// to be set with an accepted license in it. See https://developer.android.com/studio/intro/update.html#download-with-gradle.
autoDownloadAndroidSdk.set(autoDownloadAndRunInHeadless)
Expand Down
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[versions]
groovy = "3.0.15"
spock = "2.1-groovy-3.0"
# Iguana (2023.2.1.7) Canary 7
testAndroidStudioVersion = "2023.2.1.7"
testAndroidSdkVersion = "7.3.0"

[libraries]
toolingApi = "org.gradle:gradle-tooling-api:7.2"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,26 +131,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
Expand Down Expand Up @@ -198,11 +202,11 @@ fi
# 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 $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.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_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" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,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

Expand All @@ -57,11 +57,11 @@ 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

Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.gradle.enterprise").version("3.10.3")
id("com.gradle.enterprise.gradle-enterprise-conventions-plugin").version("0.7.2")
id("com.gradle.enterprise").version("3.16.2")
id("com.gradle.enterprise.gradle-enterprise-conventions-plugin").version("0.7.5")
}

checkIfCurrentJavaIsCompatible()
Expand Down
2 changes: 1 addition & 1 deletion subprojects/studio-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
groovy
`java-test-fixtures`
id("profiler.allprojects")
id("org.jetbrains.intellij") version "1.13.3"
id("org.jetbrains.intellij") version "1.17.2"
}

description = "Contains logic for Android Studio plugin that communicates with profiler"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,60 @@
package org.gradle.profiler.studio.plugin;

import java.util.Collection;
import java.util.Set;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.settings.DistributionType;
import org.jetbrains.plugins.gradle.settings.GradleProjectSettings;
import org.jetbrains.plugins.gradle.settings.GradleSettingsListener;
import org.jetbrains.plugins.gradle.settings.TestRunner;

import java.util.Collection;
import java.util.Set;

/**
* A default implementation of GradleSettingsListener that does nothing.
*/
public class DefaultGradleSettingsListener implements GradleSettingsListener {
@Override public void onProjectsLinked(@NotNull Collection<GradleProjectSettings> settings) { }
@Override public void onGradleHomeChange(@Nullable String oldPath, @Nullable String newPath, @NotNull String linkedProjectPath) { }
@Override public void onGradleDistributionTypeChange(DistributionType currentValue, @NotNull String linkedProjectPath) { }
@Override public void onServiceDirectoryPathChange(@Nullable String oldPath, @Nullable String newPath) { }
@Override public void onGradleVmOptionsChange(@Nullable String oldOptions, @Nullable String newOptions) { }
@Override public void onBuildDelegationChange(boolean delegatedBuild, @NotNull String linkedProjectPath) { }
@Override public void onTestRunnerChange(@NotNull TestRunner currentTestRunner, @NotNull String linkedProjectPath) { }
@Override public void onProjectRenamed(@NotNull String oldName, @NotNull String newName) { }
@Override public void onProjectsUnlinked(@NotNull Set<String> linkedProjectPaths) { }
@Override public void onBulkChangeStart() { }
@Override public void onBulkChangeEnd() { }
@Override
public void onProjectsLinked(@NotNull Collection<GradleProjectSettings> settings) {
}

@Override
public void onGradleHomeChange(@Nullable String oldPath, @Nullable String newPath, @NotNull String linkedProjectPath) {
}

@Override
public void onGradleDistributionTypeChange(DistributionType currentValue, @NotNull String linkedProjectPath) {
}

@Override
public void onServiceDirectoryPathChange(@Nullable String oldPath, @Nullable String newPath) {
}

@Override
public void onGradleVmOptionsChange(@Nullable String oldOptions, @Nullable String newOptions) {
}

@Override
public void onBuildDelegationChange(boolean delegatedBuild, @NotNull String linkedProjectPath) {
}

@Override
public void onTestRunnerChange(@NotNull TestRunner currentTestRunner, @NotNull String linkedProjectPath) {
}

@Override
public void onProjectRenamed(@NotNull String oldName, @NotNull String newName) {
}

@Override
public void onProjectsUnlinked(@NotNull Set<String> linkedProjectPaths) {
}

@Override
public void onBulkChangeStart() {
}

@Override
public void onBulkChangeEnd() {
}
}

0 comments on commit ab1775e

Please sign in to comment.