@@ -22,8 +22,8 @@ module.exports.register = function ({ config = {} }) {
22
22
if ( ! version ) {
23
23
const { rawgitUrl = 'https://raw.githubusercontent.com' } = config
24
24
const repositoryPath = await getRepositoryPath ( this . require ( 'isomorphic-git' ) , playbook . dir )
25
- const propertiesUrl = `${ rawgitUrl } /${ repositoryPath } /${ refname } /gradle.properties `
26
- version = await download ( get , propertiesUrl ) . then ( ( contents ) => extractVersion ( contents , refname ) )
25
+ const baseUrl = `${ rawgitUrl } /${ repositoryPath } /${ refname } `
26
+ version = await getGradleVersion ( get , baseUrl , refname )
27
27
}
28
28
if ( isBranch && version . endsWith ( '-SNAPSHOT' ) ) version = version . slice ( 0 , - 9 )
29
29
const versionsInManifest = Object . values ( siteManifestData . components ) [ 0 ] . versions
@@ -53,7 +53,12 @@ function download (get, url) {
53
53
)
54
54
}
55
55
56
- function extractVersion ( contents , fallback ) {
56
+ function getGradleVersion ( get , baseUrl , refname ) {
57
+ const gradlePropertiesUrl = `${ baseUrl } /gradle.properties`
58
+ return download ( get , gradlePropertiesUrl ) . then ( ( contents ) => extractGradleVersion ( contents , refname ) )
59
+ }
60
+
61
+ function extractGradleVersion ( contents , fallback ) {
57
62
for ( const line of ( contents . toString ( ) . trimEnd ( ) + `\nversion=${ fallback } ` ) . split ( '\n' ) ) {
58
63
if ( line . startsWith ( 'version=' ) ) return line . slice ( 8 )
59
64
}
0 commit comments