commit 526945c5798687e32d4a6f8a93660fe2ca152ae2 · pyrox.dev/nixpkgs

+171 -6

pkgs/development/compilers/flutter/versions/3_29/patches/gradle-flutter-tools-wrapper.patch

···

       15
       15
        
       This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting

     

       16
       16
        
       `rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.

     

       17
       17
        
       

     

       18
       18
       -
       Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.

     

       19
       19
       -
       To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.

     

       20
       20
       -
       diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle

     

       21
       21
       -
       new file mode 100644

     

       22
       22
       -
       index 0000000000..b2485c94b4

     

       18
       18
       +
       To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, we need to set `buildDirectory`.

     

       19
       19
       +
       To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper.

     

       20
       20
       +
       Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in.

     

       23
       21
        
       --- /dev/null

     

       24
       22
        
       +++ b/packages/flutter_tools/gradle/settings.gradle

     

       25
       23
        
       @@ -0,0 +1,19 @@

     
···

       44
       42
        
       +includeBuild(dir)

     

       45
       43
        
       --- a/packages/flutter_tools/gradle/build.gradle.kts

     

       46
       44
        
       +++ b/packages/flutter_tools/gradle/build.gradle.kts

     

       47
       47
       -
       @@ -4,6 +4,8 @@

     

       45
       45
       +
       @@ -4,6 +4,11 @@

     

       48
       46
        
        

     

       49
       47
        
        import org.jetbrains.kotlin.gradle.dsl.JvmTarget

     

       50
       48
        
        

     

       49
       49
       +
       +// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter

     

       50
       50
       +
       +// is not passed correctly to the Kotlin Gradle plugin for some reason, and so

     

       51
       51
       +
       +// must be set here as well.

     

       51
       52
        
       +gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile

     

       52
       53
        
       +

     

       53
       54
        
        plugins {

     

       54
       55
        
            `java-gradle-plugin`

     

       55
       56
        
            groovy

     

       57
       57
       +
       --- a/packages/flutter_tools/lib/src/android/gradle.dart

     

       58
       58
       +
       +++ b/packages/flutter_tools/lib/src/android/gradle.dart

     

       59
       59
       +
       @@ -456,9 +456,9 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       60
       60
       +
            // from the local.properties file.

     

       61
       61
       +
            updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo);

     

       62
       62
       +
        

     

       63
       63
       +
       -    final List<String> options = <String>[];

     

       64
       64
       +
       -

     

       65
       65
       +
       -    final String gradleExecutablePath = _gradleUtils.getExecutable(project);

     

       66
       66
       +
       +    final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(

     

       67
       67
       +
       +      project,

     

       68
       68
       +
       +    );

     

       69
       69
       +
        

     

       70
       70
       +
            // All automatically created files should exist.

     

       71
       71
       +
            if (configOnly) {

     

       72
       72
       +
       @@ -781,7 +781,7 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       73
       73
       +
              'aar_init_script.gradle',

     

       74
       74
       +
            );

     

       75
       75
       +
            final List<String> command = <String>[

     

       76
       76
       +
       -      _gradleUtils.getExecutable(project),

     

       77
       77
       +
       +      ..._gradleUtils.getExecutable(project),

     

       78
       78
       +
              '-I=$initScript',

     

       79
       79
       +
              '-Pflutter-root=$flutterRoot',

     

       80
       80
       +
              '-Poutput-dir=${outputDirectory.path}',

     

       81
       81
       +
       @@ -896,6 +896,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       82
       82
       +
            final List<String> results = <String>[];

     

       83
       83
       +
        

     

       84
       84
       +
            try {

     

       85
       85
       +
       +      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(

     

       86
       86
       +
       +        project,

     

       87
       87
       +
       +      );

     

       88
       88
       +
       +

     

       89
       89
       +
              exitCode = await _runGradleTask(

     

       90
       90
       +
                _kBuildVariantTaskName,

     

       91
       91
       +
                preRunTask: () {

     

       92
       92
       +
       @@ -911,10 +915,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       93
       93
       +
                    ),

     

       94
       94
       +
                  );

     

       95
       95
       +
                },

     

       96
       96
       +
       -        options: const <String>['-q'],

     

       97
       97
       +
       +        options: <String>[...options, '-q'],

     

       98
       98
       +
                project: project,

     

       99
       99
       +
                localGradleErrors: gradleErrors,

     

       100
       100
       +
       -        gradleExecutablePath: _gradleUtils.getExecutable(project),

     

       101
       101
       +
       +        gradleExecutablePath: gradleExecutablePath,

     

       102
       102
       +
                outputParser: (String line) {

     

       103
       103
       +
                  if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) {

     

       104
       104
       +
                    results.add(match.namedGroup(_kBuildVariantRegexGroupName)!);

     

       105
       105
       +
       @@ -948,6 +952,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       106
       106
       +
            late Stopwatch sw;

     

       107
       107
       +
            int exitCode = 1;

     

       108
       108
       +
            try {

     

       109
       109
       +
       +      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(

     

       110
       110
       +
       +        project,

     

       111
       111
       +
       +      );

     

       112
       112
       +
       +

     

       113
       113
       +
              exitCode = await _runGradleTask(

     

       114
       114
       +
                taskName,

     

       115
       115
       +
                preRunTask: () {

     

       116
       116
       +
       @@ -963,10 +971,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       117
       117
       +
                    ),

     

       118
       118
       +
                  );

     

       119
       119
       +
                },

     

       120
       120
       +
       -        options: <String>['-q', '-PoutputPath=$outputPath'],

     

       121
       121
       +
       +        options: <String>[...options, '-q', '-PoutputPath=$outputPath'],

     

       122
       122
       +
                project: project,

     

       123
       123
       +
                localGradleErrors: gradleErrors,

     

       124
       124
       +
       -        gradleExecutablePath: _gradleUtils.getExecutable(project),

     

       125
       125
       +
       +        gradleExecutablePath: gradleExecutablePath,

     

       126
       126
       +
              );

     

       127
       127
       +
            } on Error catch (error) {

     

       128
       128
       +
              _logger.printError(error.toString());

     

       129
       129
       +
       --- a/packages/flutter_tools/lib/src/android/gradle_errors.dart

     

       130
       130
       +
       +++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart

     

       131
       131
       +
       @@ -240,7 +240,12 @@ final GradleHandledError flavorUndefinedHandler = GradleHandledError(

     

       132
       132
       +
            required bool usesAndroidX,

     

       133
       133
       +
          }) async {

     

       134
       134
       +
            final RunResult tasksRunResult = await globals.processUtils.run(

     

       135
       135
       +
       -      <String>[globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'],

     

       136
       136
       +
       +      <String>[

     

       137
       137
       +
       +        ...globals.gradleUtils!.getExecutable(project),

     

       138
       138
       +
       +        'app:tasks',

     

       139
       139
       +
       +        '--all',

     

       140
       140
       +
       +        '--console=auto',

     

       141
       141
       +
       +      ],

     

       142
       142
       +
              throwOnError: true,

     

       143
       143
       +
              workingDirectory: project.android.hostAppGradleRoot.path,

     

       144
       144
       +
              environment: globals.java?.environment,

     

       145
       145
       +
       --- a/packages/flutter_tools/lib/src/android/gradle_utils.dart

     

       146
       146
       +
       +++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart

     

       147
       147
       +
       @@ -3,6 +3,7 @@

     

       148
       148
       +
        // found in the LICENSE file.

     

       149
       149
       +
        

     

       150
       150
       +
        import 'package:meta/meta.dart';

     

       151
       151
       +
       +import 'package:path/path.dart';

     

       152
       152
       +
        import 'package:process/process.dart';

     

       153
       153
       +
        import 'package:unified_analytics/unified_analytics.dart';

     

       154
       154
       +
        

     

       155
       155
       +
       @@ -154,9 +155,29 @@ class GradleUtils {

     

       156
       156
       +
          final Logger _logger;

     

       157
       157
       +
          final OperatingSystemUtils _operatingSystemUtils;

     

       158
       158
       +
        

     

       159
       159
       +
       +  List<String> get _requiredArguments {

     

       160
       160
       +
       +    final String cacheDir = join(

     

       161
       161
       +
       +      switch (globals.platform.environment['XDG_CACHE_HOME']) {

     

       162
       162
       +
       +        final String cacheHome => cacheHome,

     

       163
       163
       +
       +        _ => join(

     

       164
       164
       +
       +          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),

     

       165
       165
       +
       +          '.cache',

     

       166
       166
       +
       +        ),

     

       167
       167
       +
       +      },

     

       168
       168
       +
       +      'flutter',

     

       169
       169
       +
       +      'nix-flutter-tools-gradle',

     

       170
       170
       +
       +      globals.flutterVersion.engineRevision.substring(0, 10),

     

       171
       171
       +
       +    );

     

       172
       172
       +
       +

     

       173
       173
       +
       +    return <String>[

     

       174
       174
       +
       +      '--project-cache-dir=${join(cacheDir, 'cache')}',

     

       175
       175
       +
       +      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',

     

       176
       176
       +
       +    ];

     

       177
       177
       +
       +  }

     

       178
       178
       +
       +

     

       179
       179
       +
          /// Gets the Gradle executable path and prepares the Gradle project.

     

       180
       180
       +
          /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.

     

       181
       181
       +
       -  String getExecutable(FlutterProject project) {

     

       182
       182
       +
       +  List<String> getExecutable(FlutterProject project) {

     

       183
       183
       +
            final Directory androidDir = project.android.hostAppGradleRoot;

     

       184
       184
       +
            injectGradleWrapperIfNeeded(androidDir);

     

       185
       185
       +
        

     

       186
       186
       +
       @@ -167,7 +188,7 @@ class GradleUtils {

     

       187
       187
       +
              // If the Gradle executable doesn't have execute permission,

     

       188
       188
       +
              // then attempt to set it.

     

       189
       189
       +
              _operatingSystemUtils.makeExecutable(gradle);

     

       190
       190
       +
       -      return gradle.absolute.path;

     

       191
       191
       +
       +      return <String>[gradle.absolute.path, ..._requiredArguments];

     

       192
       192
       +
            }

     

       193
       193
       +
            throwToolExit(

     

       194
       194
       +
              'Unable to locate gradlew script. Please check that ${gradle.path} '

     

       195
       195
       +
       --- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart

     

       196
       196
       +
       +++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart

     

       197
       197
       +
       @@ -2740,8 +2740,8 @@ Gradle Crashed

     

       198
       198
       +
        

     

       199
       199
       +
        class FakeGradleUtils extends Fake implements GradleUtils {

     

       200
       200
       +
          @override

     

       201
       201
       +
       -  String getExecutable(FlutterProject project) {

     

       202
       202
       +
       -    return 'gradlew';

     

       203
       203
       +
       +  List<String> getExecutable(FlutterProject project) {

     

       204
       204
       +
       +    return const <String>['gradlew'];

     

       205
       205
       +
          }

     

       206
       206
       +
        }

     

       207
       207
       +
        

     

       208
       208
       +
       --- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart

     

       209
       209
       +
       +++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart

     

       210
       210
       +
       @@ -1580,8 +1580,8 @@ Platform fakePlatform(String name) {

     

       211
       211
       +
        

     

       212
       212
       +
        class FakeGradleUtils extends Fake implements GradleUtils {

     

       213
       213
       +
          @override

     

       214
       214
       +
       -  String getExecutable(FlutterProject project) {

     

       215
       215
       +
       -    return 'gradlew';

     

       216
       216
       +
       +  List<String> getExecutable(FlutterProject project) {

     

       217
       217
       +
       +    return const <String>['gradlew'];

     

       218
       218
       +
          }

     

       219
       219
       +
        }

     

       220
       220
       +

+171 -6

pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch

···

       15
       15
        
       This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting

     

       16
       16
        
       `rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.

     

       17
       17
        
       

     

       18
       18
       -
       Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.

     

       19
       19
       -
       To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.

     

       20
       20
       -
       diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle

     

       21
       21
       -
       new file mode 100644

     

       22
       22
       -
       index 0000000000..b2485c94b4

     

       18
       18
       +
       To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, we need to set `buildDirectory`.

     

       19
       19
       +
       To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper.

     

       20
       20
       +
       Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in.

     

       23
       21
        
       --- /dev/null

     

       24
       22
        
       +++ b/packages/flutter_tools/gradle/settings.gradle

     

       25
       23
        
       @@ -0,0 +1,19 @@

     
···

       44
       42
        
       +includeBuild(dir)

     

       45
       43
        
       --- a/packages/flutter_tools/gradle/build.gradle.kts

     

       46
       44
        
       +++ b/packages/flutter_tools/gradle/build.gradle.kts

     

       47
       47
       -
       @@ -4,6 +4,8 @@

     

       45
       45
       +
       @@ -4,6 +4,11 @@

     

       48
       46
        
        

     

       49
       47
        
        import org.jetbrains.kotlin.gradle.dsl.JvmTarget

     

       50
       48
        
        

     

       49
       49
       +
       +// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter

     

       50
       50
       +
       +// is not passed correctly to the Kotlin Gradle plugin for some reason, and so

     

       51
       51
       +
       +// must be set here as well.

     

       51
       52
        
       +gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile

     

       52
       53
        
       +

     

       53
       54
        
        plugins {

     

       54
       55
        
            `java-gradle-plugin`

     

       55
       56
        
            groovy

     

       57
       57
       +
       --- a/packages/flutter_tools/lib/src/android/gradle.dart

     

       58
       58
       +
       +++ b/packages/flutter_tools/lib/src/android/gradle.dart

     

       59
       59
       +
       @@ -456,9 +456,9 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       60
       60
       +
            // from the local.properties file.

     

       61
       61
       +
            updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo);

     

       62
       62
       +
        

     

       63
       63
       +
       -    final List<String> options = <String>[];

     

       64
       64
       +
       -

     

       65
       65
       +
       -    final String gradleExecutablePath = _gradleUtils.getExecutable(project);

     

       66
       66
       +
       +    final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(

     

       67
       67
       +
       +      project,

     

       68
       68
       +
       +    );

     

       69
       69
       +
        

     

       70
       70
       +
            // All automatically created files should exist.

     

       71
       71
       +
            if (configOnly) {

     

       72
       72
       +
       @@ -781,7 +781,7 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       73
       73
       +
              'aar_init_script.gradle',

     

       74
       74
       +
            );

     

       75
       75
       +
            final List<String> command = <String>[

     

       76
       76
       +
       -      _gradleUtils.getExecutable(project),

     

       77
       77
       +
       +      ..._gradleUtils.getExecutable(project),

     

       78
       78
       +
              '-I=$initScript',

     

       79
       79
       +
              '-Pflutter-root=$flutterRoot',

     

       80
       80
       +
              '-Poutput-dir=${outputDirectory.path}',

     

       81
       81
       +
       @@ -896,6 +896,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       82
       82
       +
            final List<String> results = <String>[];

     

       83
       83
       +
        

     

       84
       84
       +
            try {

     

       85
       85
       +
       +      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(

     

       86
       86
       +
       +        project,

     

       87
       87
       +
       +      );

     

       88
       88
       +
       +

     

       89
       89
       +
              exitCode = await _runGradleTask(

     

       90
       90
       +
                _kBuildVariantTaskName,

     

       91
       91
       +
                preRunTask: () {

     

       92
       92
       +
       @@ -911,10 +915,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       93
       93
       +
                    ),

     

       94
       94
       +
                  );

     

       95
       95
       +
                },

     

       96
       96
       +
       -        options: const <String>['-q'],

     

       97
       97
       +
       +        options: <String>[...options, '-q'],

     

       98
       98
       +
                project: project,

     

       99
       99
       +
                localGradleErrors: gradleErrors,

     

       100
       100
       +
       -        gradleExecutablePath: _gradleUtils.getExecutable(project),

     

       101
       101
       +
       +        gradleExecutablePath: gradleExecutablePath,

     

       102
       102
       +
                outputParser: (String line) {

     

       103
       103
       +
                  if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) {

     

       104
       104
       +
                    results.add(match.namedGroup(_kBuildVariantRegexGroupName)!);

     

       105
       105
       +
       @@ -948,6 +952,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       106
       106
       +
            late Stopwatch sw;

     

       107
       107
       +
            int exitCode = 1;

     

       108
       108
       +
            try {

     

       109
       109
       +
       +      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(

     

       110
       110
       +
       +        project,

     

       111
       111
       +
       +      );

     

       112
       112
       +
       +

     

       113
       113
       +
              exitCode = await _runGradleTask(

     

       114
       114
       +
                taskName,

     

       115
       115
       +
                preRunTask: () {

     

       116
       116
       +
       @@ -963,10 +971,10 @@ class AndroidGradleBuilder implements AndroidBuilder {

     

       117
       117
       +
                    ),

     

       118
       118
       +
                  );

     

       119
       119
       +
                },

     

       120
       120
       +
       -        options: <String>['-q', '-PoutputPath=$outputPath'],

     

       121
       121
       +
       +        options: <String>[...options, '-q', '-PoutputPath=$outputPath'],

     

       122
       122
       +
                project: project,

     

       123
       123
       +
                localGradleErrors: gradleErrors,

     

       124
       124
       +
       -        gradleExecutablePath: _gradleUtils.getExecutable(project),

     

       125
       125
       +
       +        gradleExecutablePath: gradleExecutablePath,

     

       126
       126
       +
              );

     

       127
       127
       +
            } on Error catch (error) {

     

       128
       128
       +
              _logger.printError(error.toString());

     

       129
       129
       +
       --- a/packages/flutter_tools/lib/src/android/gradle_errors.dart

     

       130
       130
       +
       +++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart

     

       131
       131
       +
       @@ -240,7 +240,12 @@ final GradleHandledError flavorUndefinedHandler = GradleHandledError(

     

       132
       132
       +
            required bool usesAndroidX,

     

       133
       133
       +
          }) async {

     

       134
       134
       +
            final RunResult tasksRunResult = await globals.processUtils.run(

     

       135
       135
       +
       -      <String>[globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'],

     

       136
       136
       +
       +      <String>[

     

       137
       137
       +
       +        ...globals.gradleUtils!.getExecutable(project),

     

       138
       138
       +
       +        'app:tasks',

     

       139
       139
       +
       +        '--all',

     

       140
       140
       +
       +        '--console=auto',

     

       141
       141
       +
       +      ],

     

       142
       142
       +
              throwOnError: true,

     

       143
       143
       +
              workingDirectory: project.android.hostAppGradleRoot.path,

     

       144
       144
       +
              environment: globals.java?.environment,

     

       145
       145
       +
       --- a/packages/flutter_tools/lib/src/android/gradle_utils.dart

     

       146
       146
       +
       +++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart

     

       147
       147
       +
       @@ -3,6 +3,7 @@

     

       148
       148
       +
        // found in the LICENSE file.

     

       149
       149
       +
        

     

       150
       150
       +
        import 'package:meta/meta.dart';

     

       151
       151
       +
       +import 'package:path/path.dart';

     

       152
       152
       +
        import 'package:process/process.dart';

     

       153
       153
       +
        import 'package:unified_analytics/unified_analytics.dart';

     

       154
       154
       +
        

     

       155
       155
       +
       @@ -154,9 +155,29 @@ class GradleUtils {

     

       156
       156
       +
          final Logger _logger;

     

       157
       157
       +
          final OperatingSystemUtils _operatingSystemUtils;

     

       158
       158
       +
        

     

       159
       159
       +
       +  List<String> get _requiredArguments {

     

       160
       160
       +
       +    final String cacheDir = join(

     

       161
       161
       +
       +      switch (globals.platform.environment['XDG_CACHE_HOME']) {

     

       162
       162
       +
       +        final String cacheHome => cacheHome,

     

       163
       163
       +
       +        _ => join(

     

       164
       164
       +
       +          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),

     

       165
       165
       +
       +          '.cache',

     

       166
       166
       +
       +        ),

     

       167
       167
       +
       +      },

     

       168
       168
       +
       +      'flutter',

     

       169
       169
       +
       +      'nix-flutter-tools-gradle',

     

       170
       170
       +
       +      globals.flutterVersion.engineRevision.substring(0, 10),

     

       171
       171
       +
       +    );

     

       172
       172
       +
       +

     

       173
       173
       +
       +    return <String>[

     

       174
       174
       +
       +      '--project-cache-dir=${join(cacheDir, 'cache')}',

     

       175
       175
       +
       +      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',

     

       176
       176
       +
       +    ];

     

       177
       177
       +
       +  }

     

       178
       178
       +
       +

     

       179
       179
       +
          /// Gets the Gradle executable path and prepares the Gradle project.

     

       180
       180
       +
          /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.

     

       181
       181
       +
       -  String getExecutable(FlutterProject project) {

     

       182
       182
       +
       +  List<String> getExecutable(FlutterProject project) {

     

       183
       183
       +
            final Directory androidDir = project.android.hostAppGradleRoot;

     

       184
       184
       +
            injectGradleWrapperIfNeeded(androidDir);

     

       185
       185
       +
        

     

       186
       186
       +
       @@ -167,7 +188,7 @@ class GradleUtils {

     

       187
       187
       +
              // If the Gradle executable doesn't have execute permission,

     

       188
       188
       +
              // then attempt to set it.

     

       189
       189
       +
              _operatingSystemUtils.makeExecutable(gradle);

     

       190
       190
       +
       -      return gradle.absolute.path;

     

       191
       191
       +
       +      return <String>[gradle.absolute.path, ..._requiredArguments];

     

       192
       192
       +
            }

     

       193
       193
       +
            throwToolExit(

     

       194
       194
       +
              'Unable to locate gradlew script. Please check that ${gradle.path} '

     

       195
       195
       +
       --- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart

     

       196
       196
       +
       +++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart

     

       197
       197
       +
       @@ -2740,8 +2740,8 @@ Gradle Crashed

     

       198
       198
       +
        

     

       199
       199
       +
        class FakeGradleUtils extends Fake implements GradleUtils {

     

       200
       200
       +
          @override

     

       201
       201
       +
       -  String getExecutable(FlutterProject project) {

     

       202
       202
       +
       -    return 'gradlew';

     

       203
       203
       +
       +  List<String> getExecutable(FlutterProject project) {

     

       204
       204
       +
       +    return const <String>['gradlew'];

     

       205
       205
       +
          }

     

       206
       206
       +
        }

     

       207
       207
       +
        

     

       208
       208
       +
       --- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart

     

       209
       209
       +
       +++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart

     

       210
       210
       +
       @@ -1580,8 +1580,8 @@ Platform fakePlatform(String name) {

     

       211
       211
       +
        

     

       212
       212
       +
        class FakeGradleUtils extends Fake implements GradleUtils {

     

       213
       213
       +
          @override

     

       214
       214
       +
       -  String getExecutable(FlutterProject project) {

     

       215
       215
       +
       -    return 'gradlew';

     

       216
       216
       +
       +  List<String> getExecutable(FlutterProject project) {

     

       217
       217
       +
       +    return const <String>['gradlew'];

     

       218
       218
       +
          }

     

       219
       219
       +
        }

     

       220
       220
       +