refactor(gradle-wrapper): autoReplace (#6004)

renovatebot · Apr 20, 2020 · 0342dab · 0342dab
1 parent 9d7f8b4
commit 0342dab
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 700 deletions.
diff --git a/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap b/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap
diff --git a/lib/datasource/gradle-version/index.ts b/lib/datasource/gradle-version/index.ts
@@ -20,8 +20,6 @@ interface GradleRelease {
   nightly?: boolean;
   rcFor?: string;
   version: string;
-  downloadUrl?: string;
-  checksumUrl?: string;
   buildTime?: string;
 }
 
@@ -59,8 +57,6 @@ export async function getReleases({
           )
           .map((release) => ({
             version: release.version,
-            downloadUrl: release.downloadUrl,
-            checksumUrl: release.checksumUrl,
             releaseTimestamp: formatBuildTime(release.buildTime),
           }));
         return releases;

diff --git a/lib/manager/common.ts b/lib/manager/common.ts
@@ -177,11 +177,9 @@ export interface Upgrade<T = Record<string, any>>
     NpmLockFiles {
   isLockfileUpdate?: boolean;
   currentRawValue?: any;
-  checksumUrl?: string;
   currentVersion?: string;
   depGroup?: string;
   dockerRepository?: string;
-  downloadUrl?: string;
   localDir?: string;
   name?: string;
   newDigest?: string;

diff --git a/lib/manager/gradle-wrapper/__snapshots__/extract.spec.ts.snap b/lib/manager/gradle-wrapper/__snapshots__/extract.spec.ts.snap
@@ -6,29 +6,18 @@ Array [
     "currentValue": "4.10.3",
     "datasource": "gradle-version",
     "depName": "gradle",
-    "depType": "gradle-wrapper",
-    "managerData": Object {
-      "checksumLineNumber": 6,
-      "gradleWrapperType": "all",
-      "lineNumber": 5,
-    },
-    "versioning": "semver",
+    "versioning": "gradle",
   },
 ]
 `;
 
 exports[`lib/manager/gradle-wrapper/extract extractPackageFile() extracts bin version line 1`] = `
 Array [
   Object {
-    "currentValue": "4.8.0",
+    "currentValue": "4.8",
     "datasource": "gradle-version",
     "depName": "gradle",
-    "depType": "gradle-wrapper",
-    "managerData": Object {
-      "gradleWrapperType": "bin",
-      "lineNumber": 4,
-    },
-    "versioning": "semver",
+    "versioning": "gradle",
   },
 ]
 `;
@@ -39,13 +28,7 @@ Array [
     "currentValue": "4.10.3",
     "datasource": "gradle-version",
     "depName": "gradle",
-    "depType": "gradle-wrapper",
-    "managerData": Object {
-      "checksumLineNumber": 6,
-      "gradleWrapperType": "all",
-      "lineNumber": 5,
-    },
-    "versioning": "semver",
+    "versioning": "gradle",
   },
 ]
 `;
diff --git a/lib/manager/gradle-wrapper/__snapshots__/update.spec.ts.snap b/lib/manager/gradle-wrapper/__snapshots__/update.spec.ts.snap
diff --git a/lib/manager/gradle-wrapper/extract.ts b/lib/manager/gradle-wrapper/extract.ts
@@ -1,44 +1,26 @@
-import { coerce } from 'semver';
 import { logger } from '../../logger';
 import { PackageFile, PackageDependency } from '../common';
-import * as semverVersioning from '../../versioning/semver';
+import * as gradleVersioning from '../../versioning/gradle';
 import * as datasourceGradleVersion from '../../datasource/gradle-version';
-import { DISTRIBUTION_CHECKSUM_REGEX, DISTRIBUTION_URL_REGEX } from './search';
+
+const DISTRIBUTION_URL_REGEX = /^(?<assignment>distributionUrl\s*=\s*)\S*-(?<version>(\d|\.)+)-(?<type>bin|all)\.zip\s*$/;
 
 export function extractPackageFile(fileContent: string): PackageFile | null {
   logger.debug('gradle-wrapper.extractPackageFile()');
   const lines = fileContent.split('\n');
 
-  let lineNumber = 0;
   for (const line of lines) {
     const distributionUrlMatch = DISTRIBUTION_URL_REGEX.exec(line);
     if (distributionUrlMatch) {
       const dependency: PackageDependency = {
-        datasource: datasourceGradleVersion.id,
-        depType: 'gradle-wrapper',
         depName: 'gradle',
-        currentValue: coerce(distributionUrlMatch.groups.version).toString(),
-        managerData: {
-          lineNumber,
-          gradleWrapperType: distributionUrlMatch.groups.type,
-        },
-        versioning: semverVersioning.id,
+        currentValue: distributionUrlMatch.groups.version,
+        datasource: datasourceGradleVersion.id,
+        versioning: gradleVersioning.id,
       };
-
-      let shaLineNumber = 0;
-      for (const shaLine of lines) {
-        const shaMatch = DISTRIBUTION_CHECKSUM_REGEX.test(shaLine);
-        if (shaMatch) {
-          dependency.managerData.checksumLineNumber = shaLineNumber;
-          break;
-        }
-        shaLineNumber += 1;
-      }
-
       logger.debug(dependency, 'Gradle Wrapper');
       return { deps: [dependency] };
     }
-    lineNumber += 1;
   }
   return null;
 }
diff --git a/lib/manager/gradle-wrapper/index.ts b/lib/manager/gradle-wrapper/index.ts
@@ -2,7 +2,6 @@ import { id as versioning } from '../../versioning/gradle';
 
 export { extractPackageFile } from './extract';
 export { updateArtifacts } from './artifacts';
-export { updateDependency } from './update';
 
 export const defaultConfig = {
   fileMatch: ['(^|/)gradle/wrapper/gradle-wrapper.properties$'],

diff --git a/lib/manager/gradle-wrapper/search.ts b/lib/manager/gradle-wrapper/search.ts
diff --git a/lib/manager/gradle-wrapper/update.spec.ts b/lib/manager/gradle-wrapper/update.spec.ts
diff --git a/lib/manager/gradle-wrapper/update.ts b/lib/manager/gradle-wrapper/update.ts
diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts
@@ -330,8 +330,6 @@ export async function lookupUpdates(
       const releaseFields = [
         'releaseTimestamp',
         'canBeUnpublished',
-        'downloadUrl',
-        'checksumUrl',
         'newDigest',
       ];
       releaseFields.forEach((field) => {