feat: move gradle wrapper from tools to platform root dir

Author: erisu

.gitignore

@@ -31,6 +31,9 @@ example
 /test/.externalNativeBuild
 /test/androidx/cdv-gradle-config.json
 /test/androidx/tools
+/test/androidx/gradle
+/test/androidx/gradlew
+/test/androidx/gradlew.bat
 /test/assets/www/.tmp*
 /test/assets/www/cordova.js
 /test/bin
@@ -39,6 +42,7 @@ example
 /test/libs
 tmp/**
 tmp/**/*
+
 !/spec/fixtures/org.test.plugins.dummyplugin/src/android/TestLib.jar
 # IntelliJ IDEA files
 **/.idea/**/*

lib/builders/ProjectBuilder.js

@@ -115,7 +115,7 @@ class ProjectBuilder {
     }
 
     getGradleWrapperPath () {
-        let wrapper = path.join(this.root, 'tools', 'gradlew');
+        let wrapper = path.join(this.root, 'gradlew');
 
         if (isWindows()) {
             wrapper += '.bat';
@@ -132,9 +132,9 @@ class ProjectBuilder {
     async installGradleWrapper (gradleVersion) {
         if (process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL) {
             events.emit('verbose', `Overriding Gradle Version via CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL (${process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL})`);
-            await execa('gradle', ['-p', path.join(this.root, 'tools'), 'wrapper', '--gradle-distribution-url', process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL], { stdio: 'inherit' });
+            await execa('gradle', ['-p', path.join(this.root), 'wrapper', '--gradle-distribution-url', process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL], { stdio: 'inherit' });
         } else {
-            await execa('gradle', ['-p', path.join(this.root, 'tools'), 'wrapper', '--gradle-version', gradleVersion], { stdio: 'inherit' });
+            await execa('gradle', ['-p', path.join(this.root), 'wrapper', '--gradle-version', gradleVersion], { stdio: 'inherit' });
         }
     }
 

lib/create.js

@@ -120,8 +120,6 @@ function copyBuildRules (projectPath) {
     fs.cpSync(path.join(srcDir, 'app', 'build.gradle'), path.join(projectPath, 'app', 'build.gradle'));
     fs.cpSync(path.join(srcDir, 'app', 'repositories.gradle'), path.join(projectPath, 'app', 'repositories.gradle'));
     fs.cpSync(path.join(srcDir, 'repositories.gradle'), path.join(projectPath, 'repositories.gradle'));
-
-    copyGradleTools(projectPath);
 }
 
 function copyScripts (projectPath) {
@@ -171,12 +169,6 @@ function validateProjectName (project_name) {
     return Promise.resolve();
 }
 
-function copyGradleTools (projectPath) {
-    const srcDir = path.join(ROOT, 'templates', 'project');
-
-    fs.cpSync(path.resolve(srcDir, 'tools'), path.resolve(projectPath, 'tools'), { recursive: true });
-}
-
 /**
  * Creates an android application with the given options.
  *

spec/unit/builders/ProjectBuilder.spec.js

@@ -136,14 +136,14 @@ describe('ProjectBuilder', () => {
 
         it('should run gradle wrapper 8.7', async () => {
             await builder.installGradleWrapper('8.7');
-            expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root/tools'), 'wrapper', '--gradle-version', '8.7'], jasmine.any(Object));
+            expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root'), 'wrapper', '--gradle-version', '8.7'], jasmine.any(Object));
         });
 
         it('CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL should override gradle version', async () => {
             process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL = 'https://dist.local';
             await builder.installGradleWrapper('8.7');
             delete process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL;
-            expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root/tools'), 'wrapper', '--gradle-distribution-url', 'https://dist.local'], jasmine.any(Object));
+            expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root'), 'wrapper', '--gradle-distribution-url', 'https://dist.local'], jasmine.any(Object));
         });
     });
 
@@ -176,7 +176,7 @@ describe('ProjectBuilder', () => {
 
             builder.build({});
 
-            let gradle = path.join(rootDir, 'tools', 'gradlew');
+            let gradle = path.join(rootDir, 'gradlew');
             if (isWindows()) {
                 gradle += '.bat';
             }
@@ -238,7 +238,7 @@ describe('ProjectBuilder', () => {
             const gradleArgs = ['test', 'args', '-f'];
             builder.getArgs.and.returnValue(gradleArgs);
 
-            let gradle = path.join(rootDir, 'tools', 'gradlew');
+            let gradle = path.join(rootDir, 'gradlew');
             if (isWindows()) {
                 gradle += '.bat';
             }

templates/project/tools/settings.gradle

@@ -28,7 +28,7 @@ class AndroidTestRunner {
     constructor (testTitle, projectDir) {
         this.testTitle = testTitle;
         this.projectDir = projectDir;
-        this.gradleWrapper = path.join(this.projectDir, 'tools/gradlew');
+        this.gradleWrapper = path.join(this.projectDir, 'gradlew');
     }
 
     _gradlew (...args) {
@@ -62,7 +62,6 @@ class AndroidTestRunner {
             .then(_ => {
                 // TODO we should probably not only copy these files, but instead create a new project from scratch
                 fs.copyFileSync(path.resolve(this.projectDir, '../../framework/cdv-gradle-config-defaults.json'), path.resolve(this.projectDir, 'cdv-gradle-config.json'));
-                fs.cpSync(path.resolve(this.projectDir, '../../templates/project/tools'), path.resolve(this.projectDir, 'tools'), { recursive: true });
                 fs.copyFileSync(
                     path.join(__dirname, '../templates/project/assets/www/cordova.js'),
                     path.join(this.projectDir, 'app/src/main/assets/www/cordova.js')