@@ -32,7 +32,6 @@ function cmd(cmd, args, stdoutListener) {
32
32
}
33
33
34
34
try {
35
-
36
35
const maven = fs . existsSync ( 'pom.xml' )
37
36
const gradleGroovy = fs . existsSync ( 'build.gradle' )
38
37
const gradleKotlin = fs . existsSync ( 'build.gradle.kts' )
@@ -41,16 +40,16 @@ try {
41
40
console . log ( gradleGroovy )
42
41
console . log ( gradleKotlin )
43
42
44
- if ( maven ) { // maven build
43
+ if ( maven ) {
44
+ const mavenExpression = core . getInput ( 'maven-expression' ) ;
45
45
cmd (
46
46
"mvn" ,
47
47
[
48
48
"help:evaluate" ,
49
49
"-q" ,
50
50
"-DforceStdout" ,
51
- " -Dexpression=maven.compiler.target" ,
51
+ ` -Dexpression=${ mavenExpression } ` ,
52
52
] ,
53
- // ["help:evaluate", "-q", "-DforceStdout", "-Dexpression=java.version"],
54
53
( outputBuffer ) => {
55
54
const output = outputBuffer . toString ( ) ;
56
55
console . log ( output ) ;
@@ -64,23 +63,19 @@ try {
64
63
} ) ;
65
64
}
66
65
) ;
67
- } //
68
- else {
66
+ } else {
69
67
if ( gradleGroovy || gradleKotlin ) {
70
68
cmd ( "./gradlew" , [ ':properties' , '--property' , 'sourceCompatibility' ] , outputBuffer => {
71
69
const buff = outputBuffer . toString ( ) ;
72
- if ( buff . indexOf ( 'sourceCompatibility' ) != - 1 ) {
73
- console . log ( 'sourceCompatibility: ' + buff )
74
- }
75
- else {
76
- console . log ( 'nope!' )
70
+ if ( buff . indexOf ( 'sourceCompatibility' ) != - 1 ) {
71
+ console . log ( 'sourceCompatibility: ' + buff )
72
+ } else {
73
+ console . log ( 'nope!' )
77
74
}
78
-
79
-
80
75
} ) ;
81
76
}
82
77
}
83
78
} catch ( error ) {
84
79
core . setFailed ( error . message ) ;
85
- }
80
+ }
86
81
0 commit comments