Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
4537ec1c
Unverified
Commit
4537ec1c
authored
5 years ago
by
Joshua Gleitze
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
refactor(gradle-wrapper): Extract Regexes & Named Capturing Gro… (#5742)
parent
8c3b8d21
Branches
Branches containing commit
Tags
19.38.3
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/manager/gradle-wrapper/extract.ts
+9
-9
9 additions, 9 deletions
lib/manager/gradle-wrapper/extract.ts
lib/manager/gradle-wrapper/search.ts
+2
-0
2 additions, 0 deletions
lib/manager/gradle-wrapper/search.ts
lib/manager/gradle-wrapper/update.ts
+3
-2
3 additions, 2 deletions
lib/manager/gradle-wrapper/update.ts
with
14 additions
and
11 deletions
lib/manager/gradle-wrapper/extract.ts
+
9
−
9
View file @
4537ec1c
...
@@ -3,6 +3,7 @@ import { logger } from '../../logger';
...
@@ -3,6 +3,7 @@ import { logger } from '../../logger';
import
{
PackageFile
,
PackageDependency
}
from
'
../common
'
;
import
{
PackageFile
,
PackageDependency
}
from
'
../common
'
;
import
*
as
semverVersioning
from
'
../../versioning/semver
'
;
import
*
as
semverVersioning
from
'
../../versioning/semver
'
;
import
*
as
datasourceGradleVersion
from
'
../../datasource/gradle-version
'
;
import
*
as
datasourceGradleVersion
from
'
../../datasource/gradle-version
'
;
import
{
DISTRIBUTION_CHECKSUM_REGEX
,
DISTRIBUTION_URL_REGEX
}
from
'
./search
'
;
export
function
extractPackageFile
(
fileContent
:
string
):
PackageFile
|
null
{
export
function
extractPackageFile
(
fileContent
:
string
):
PackageFile
|
null
{
logger
.
debug
(
'
gradle-wrapper.extractPackageFile()
'
);
logger
.
debug
(
'
gradle-wrapper.extractPackageFile()
'
);
...
@@ -10,24 +11,23 @@ export function extractPackageFile(fileContent: string): PackageFile | null {
...
@@ -10,24 +11,23 @@ export function extractPackageFile(fileContent: string): PackageFile | null {
let
lineNumber
=
0
;
let
lineNumber
=
0
;
for
(
const
line
of
lines
)
{
for
(
const
line
of
lines
)
{
const
match
=
/^distributionUrl
\s
*=
\s
*
\S
*-
((\d
|
\.)
+
)
-
(
bin|all
)\.
zip
\s
*$/
.
exec
(
const
distributionUrlMatch
=
DISTRIBUTION_URL_REGEX
.
exec
(
line
);
line
if
(
distributionUrlMatch
)
{
);
if
(
match
)
{
const
dependency
:
PackageDependency
=
{
const
dependency
:
PackageDependency
=
{
datasource
:
datasourceGradleVersion
.
id
,
datasource
:
datasourceGradleVersion
.
id
,
depType
:
'
gradle-wrapper
'
,
depType
:
'
gradle-wrapper
'
,
depName
:
'
gradle
'
,
depName
:
'
gradle
'
,
currentValue
:
coerce
(
match
[
1
]).
toString
(),
currentValue
:
coerce
(
distributionUrlMatch
.
groups
.
version
).
toString
(),
managerData
:
{
lineNumber
,
gradleWrapperType
:
match
[
3
]
},
managerData
:
{
lineNumber
,
gradleWrapperType
:
distributionUrlMatch
.
groups
.
type
,
},
versioning
:
semverVersioning
.
id
,
versioning
:
semverVersioning
.
id
,
};
};
let
shaLineNumber
=
0
;
let
shaLineNumber
=
0
;
for
(
const
shaLine
of
lines
)
{
for
(
const
shaLine
of
lines
)
{
const
shaMatch
=
/^distributionSha256Sum
\s
*=
\s
*
((\w){64})
.*$/
.
test
(
const
shaMatch
=
DISTRIBUTION_CHECKSUM_REGEX
.
test
(
shaLine
);
shaLine
);
if
(
shaMatch
)
{
if
(
shaMatch
)
{
dependency
.
managerData
.
checksumLineNumber
=
shaLineNumber
;
dependency
.
managerData
.
checksumLineNumber
=
shaLineNumber
;
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
lib/manager/gradle-wrapper/search.ts
0 → 100644
+
2
−
0
View file @
4537ec1c
export
const
DISTRIBUTION_URL_REGEX
=
/^
(?<
assignment>distributionUrl
\s
*=
\s
*
)\S
*-
(?<
version>
(\d
|
\.)
+
)
-
(?<
type>bin|all
)\.
zip
\s
*$/
;
export
const
DISTRIBUTION_CHECKSUM_REGEX
=
/^
(?<
assignment>distributionSha256Sum
\s
*=
\s
*
)(?<
checksum>
(\w){64})
.*$/
;
This diff is collapsed.
Click to expand it.
lib/manager/gradle-wrapper/update.ts
+
3
−
2
View file @
4537ec1c
import
got
from
'
../../util/got
'
;
import
got
from
'
../../util/got
'
;
import
{
logger
}
from
'
../../logger
'
;
import
{
logger
}
from
'
../../logger
'
;
import
{
UpdateDependencyConfig
}
from
'
../common
'
;
import
{
UpdateDependencyConfig
}
from
'
../common
'
;
import
{
DISTRIBUTION_CHECKSUM_REGEX
,
DISTRIBUTION_URL_REGEX
}
from
'
./search
'
;
function
replaceType
(
url
:
string
):
string
{
function
replaceType
(
url
:
string
):
string
{
return
url
.
replace
(
'
bin
'
,
'
all
'
);
return
url
.
replace
(
'
bin
'
,
'
all
'
);
...
@@ -40,12 +41,12 @@ export async function updateDependency({
...
@@ -40,12 +41,12 @@ export async function updateDependency({
lines
[
upgrade
.
managerData
.
lineNumber
]
=
lines
[
lines
[
upgrade
.
managerData
.
lineNumber
]
=
lines
[
upgrade
.
managerData
.
lineNumber
upgrade
.
managerData
.
lineNumber
].
replace
(
/
(
distributionUrl
\s
*=
\s
*
)\S
*/
,
`$1
${
downloadUrl
}
`
);
].
replace
(
DISTRIBUTION_URL_REGEX
,
`$<assignment>
${
downloadUrl
}
`
);
if
(
upgrade
.
managerData
.
checksumLineNumber
)
{
if
(
upgrade
.
managerData
.
checksumLineNumber
)
{
lines
[
upgrade
.
managerData
.
checksumLineNumber
]
=
lines
[
lines
[
upgrade
.
managerData
.
checksumLineNumber
]
=
lines
[
upgrade
.
managerData
.
checksumLineNumber
upgrade
.
managerData
.
checksumLineNumber
].
replace
(
/
(
distributionSha256Sum
\s
*=
\s
*
)\S
*/
,
`$1
${
checksum
}
`
);
].
replace
(
DISTRIBUTION_CHECKSUM_REGEX
,
`$<assignment>
${
checksum
}
`
);
}
}
// TODO: insert if not present
// TODO: insert if not present
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment