Skip to content

Commit

Permalink
feat(gradle): remove deepExtract (#14497)
Browse files Browse the repository at this point in the history
Removes Gradle `deepExtract` option

BREAKING CHANGE: Option `deepExtract` is now removed and will be ignored
  • Loading branch information
rarkins committed Mar 4, 2022
1 parent 143c9a6 commit 8bd77f7
Show file tree
Hide file tree
Showing 55 changed files with 150 additions and 4,386 deletions.
10 changes: 0 additions & 10 deletions docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -456,16 +456,6 @@ If you need to _override_ constraints that Renovate detects from the repository,
!!! note
Make sure not to mix this up with the term `compatibility`, which Renovate uses in the context of version releases, e.g. if a Docker image is `node:12.16.0-alpine` then the `-alpine` suffix represents `compatibility`.

## deepExtract

<!-- prettier-ignore -->
!!! warning
The `deepExtract` configuration option is deprecated, and will be removed in a future Renovate release.

If configured to `true`, then dependency extraction will be done using the relevant package manager instead of JavaScript-based parsing.

This option applies only to the `gradle` manager.

## defaultRegistryUrls

Override a datasource's default registries with this config option.
Expand Down
6 changes: 0 additions & 6 deletions docs/usage/java.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ Any repository URLs found within will be added as `registryUrls` to extracted de

## Custom registry support, and authentication

Unless using `deepExtract`, Renovate does not make use of authentication credentials available to Gradle.

<!-- prettier-ignore -->
!!! warning
The `deepExtract` configuration option is deprecated, and will be removed in a future Renovate release.

The manager for Gradle makes use of the `maven` datasource.
Renovate can be configured to access additional repositories and access repositories authenticated.

Expand Down
1 change: 1 addition & 0 deletions lib/config/migration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ describe('config/migration', () => {
onboarding: 'false' as never,
multipleMajorPrs: true,
gitFs: false,
deepExtract: true,
ignoreNpmrcFile: true,
separateMajorReleases: true,
separatePatchReleases: true,
Expand Down
1 change: 1 addition & 0 deletions lib/config/migrations/migrations-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import type { Migration, MigrationConstructor } from './types';

export class MigrationsService {
static readonly removedProperties: ReadonlySet<string> = new Set([
'deepExtract',
'gitFs',
'groupBranchName',
'groupCommitMessage',
Expand Down
9 changes: 0 additions & 9 deletions lib/config/options/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,6 @@ const options: RenovateOptions[] = [
cli: false,
env: false,
},
{
name: 'deepExtract',
description: `Enable extraction of dependencies using package managers.`,
type: 'boolean',
default: false,
cli: false,
env: false,
supportedManagers: ['gradle'],
},
{
name: 'repositoryCache',
description: 'Option to do repository extract caching.',
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/gradle-wrapper/artifacts-real.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { git, partial } from '../../../../test/util';
import { GlobalConfig } from '../../../config/global';
import type { RepoGlobalConfig } from '../../../config/types';
import type { StatusResult } from '../../../util/git/types';
import { ifSystemSupportsGradle } from '../gradle/deep/__testutil__/gradle';
import { ifSystemSupportsGradle } from '../gradle/__testutil__/gradle';
import type { UpdateArtifactsConfig } from '../types';
import * as gradleWrapper from '.';

Expand Down
1 change: 1 addition & 0 deletions lib/modules/manager/gradle-wrapper/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const extraEnv = {
'-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.caching=false',
};

// istanbul ignore next
export function gradleWrapperFileName(): string {
if (
os.platform() === 'win32' &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules/manager/gradle/shallow/extract extracts from cross-referenced files 1`] = `
exports[`modules/manager/gradle/extract extracts from cross-referenced files 1`] = `
Array [
Object {
"datasource": "maven",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules/manager/gradle/shallow/parser calculations parses fixture from "gradle" manager 1`] = `
exports[`modules/manager/gradle/parser calculations parses fixture from "gradle" manager 1`] = `
Array [
Object {
"currentValue": "1.5.2.RELEASE",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function determineJavaVersion(): number {
} catch (e) {
error = e;
}
if (javaVersionCommand.error) {
if (javaVersionCommand?.error) {
error = javaVersionCommand.error;
}
if (error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export { MAVEN_REPO } from '../../../datasource/maven/common';
export { MAVEN_REPO } from '../../datasource/maven/common';

export const JCENTER_REPO = 'https://jcenter.bintray.com/';
export const GOOGLE_REPO = 'https://dl.google.com/android/maven2/';
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

183 changes: 0 additions & 183 deletions lib/modules/manager/gradle/deep/__fixtures__/gradle-wrappers/5/gradlew

This file was deleted.

Loading

0 comments on commit 8bd77f7

Please sign in to comment.