Skip to content

Commit 48bbb3f

Browse files
committed
Simplify PGP signing config
1 parent 8a60fcc commit 48bbb3f

1 file changed

Lines changed: 1 addition & 10 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import com.google.protobuf.gradle.ProtobufExtension
33
import com.google.protobuf.gradle.proto
4-
import java.nio.charset.StandardCharsets
5-
import java.util.Base64
64
import org.gradle.api.JavaVersion
75
import org.gradle.api.distribution.DistributionContainer
86
import org.gradle.api.plugins.JavaApplication
@@ -29,13 +27,6 @@ plugins {
2927
alias(libs.plugins.shadow) apply false
3028
}
3129

32-
fun decodePgpSecret(raw: String): String =
33-
if (raw.contains("BEGIN PGP")) {
34-
raw
35-
} else {
36-
runCatching { String(Base64.getDecoder().decode(raw), StandardCharsets.UTF_8) }.getOrElse { raw }
37-
}
38-
3930
val computedVersion =
4031
providers
4132
.gradleProperty("releaseVersion")
@@ -63,7 +54,7 @@ val javacTestJvmOptions = javacModuleOptions.map { it.removePrefix("-J") }
6354
val catalog = libs
6455
val protobufVersion = catalog.versions.protobuf.asProvider().get()
6556
val repositoryUrl = "https://github.com/sourcegraph/scip-java"
66-
val signingKey = providers.environmentVariable("PGP_SECRET").map(::decodePgpSecret)
57+
val signingKey = providers.environmentVariable("PGP_SECRET")
6758
val signingPassword = providers.environmentVariable("PGP_PASSPHRASE")
6859

6960
allprojects {

0 commit comments

Comments
 (0)