Skip to content

Commit 2e5076c

Browse files
authored
Use the version of urlencode/decode available on java 8
1 parent 2843fc2 commit 2e5076c

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

buildSrc/src/main/kotlin/com/toasttab/protokt/gradle/ProtobufBuild.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import com.google.protobuf.gradle.protoc
2525
import com.google.protobuf.gradle.remove
2626
import java.io.File
2727
import java.net.URLEncoder
28-
import java.nio.charset.StandardCharsets
2928
import org.gradle.api.Project
3029
import org.gradle.api.file.FileCollection
3130
import org.gradle.api.plugins.JavaPluginConvention
@@ -86,7 +85,7 @@ private fun extraClasspath(project: Project, task: GenerateProtoTask): String {
8685
extensions += project.configurations.getByName(TEST_EXTENSIONS)
8786
}
8887

89-
return extensions.joinToString(";") { URLEncoder.encode(it.path, StandardCharsets.UTF_8) }
88+
return extensions.joinToString(";") { URLEncoder.encode(it.path, "UTF-8") }
9089
}
9190

9291
private fun configureSources(project: Project, generatedSourcesPath: String) {

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/protoc/ProtocolContext.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ import com.toasttab.protokt.gradle.ONLY_GENERATE_GRPC
2323
import com.toasttab.protokt.gradle.RESPECT_JAVA_PACKAGE
2424
import com.toasttab.protokt.util.getProtoktVersion
2525
import java.net.URLDecoder
26-
import java.nio.charset.StandardCharsets
2726

2827
class ProtocolContext(
2928
val fdp: FileDescriptorProto,
3029
val allPackagesByTypeName: Map<String, PPackage>,
3130
params: Map<String, String>
3231
) {
3332
val classpath = params.getOrDefault(KOTLIN_EXTRA_CLASSPATH, "").split(";").map {
34-
URLDecoder.decode(it, StandardCharsets.UTF_8)
33+
URLDecoder.decode(it, "UTF-8")
3534
}
3635

3736
val respectJavaPackage = respectJavaPackage(params)

0 commit comments

Comments
 (0)