File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed
codegen/src/main/scala/akka/grpc/gen
gradle-plugin/src/main/groovy/akka/grpc/gradle Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change 5
5
package akka .grpc .gen
6
6
7
7
import java .io .ByteArrayOutputStream
8
+ import java .net .URLDecoder
8
9
9
10
import com .google .protobuf .compiler .PluginProtos .CodeGeneratorRequest
10
11
import akka .grpc .gen .javadsl .{ JavaClientCodeGenerator , JavaInterfaceCodeGenerator , JavaServerCodeGenerator }
@@ -45,7 +46,14 @@ object Main extends App {
45
46
private val extraGenerators : List [String ] =
46
47
parameters.getOrElse(" extra_generators" , " " ).split(" ;" ).toList.filter(_ != " " )
47
48
48
- private val logger = parameters.get(" logfile" ).map(new FileLogger (_)).getOrElse(SilencedLogger )
49
+ // Prefer logfile_enc with fallback to logfile
50
+ private val logger : Logger =
51
+ parameters
52
+ .get(" logfile_enc" )
53
+ .map(URLDecoder .decode(_, " utf-8" ))
54
+ .orElse(parameters.get(" logfile" ))
55
+ .map(new FileLogger (_))
56
+ .getOrElse(SilencedLogger )
49
57
50
58
val out = {
51
59
val codeGenerators =
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ import org.gradle.internal.component.local.model.DefaultProjectComponentSelector
11
11
import org.gradle.util.GradleVersion
12
12
import org.gradle.util.VersionNumber
13
13
14
+ import java.net.URLEncoder
14
15
import java.nio.file.Files
15
16
import java.nio.file.Path
16
17
@@ -125,7 +126,7 @@ class AkkaGrpcPlugin implements Plugin<Project> {
125
126
option " server_power_apis=${ akkaGrpcExt.serverPowerApis} "
126
127
option " use_play_actions=${ akkaGrpcExt.usePlayActions} "
127
128
option " extra_generators=${ akkaGrpcExt.extraGenerators.join(';')} "
128
- option " logfile =${ project.projectDir.toPath().relativize( logFile) .toString()} "
129
+ option " logfile_enc =${ URLEncoder.encode( logFile.toString(), "utf-8" )} "
129
130
if (akkaGrpcExt. includeStdTypes) {
130
131
option " include_std_types=true"
131
132
}
You can’t perform that action at this time.
0 commit comments