Skip to content

Commit 473af7f

Browse files
authored
try another way to extract executable (#203)
1 parent 31a8c00 commit 473af7f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

protokt-gradle-plugin/src/main/kotlin/protokt/v1/gradle/BinaryInstaller.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
package protokt.v1.gradle
1717

1818
import org.gradle.api.Project
19-
import org.gradle.api.artifacts.Dependency
2019

2120
private const val CODEGEN_CONFIGURATION = "protoktCodegen"
2221

2322
internal fun binaryFromArtifact(project: Project): String {
23+
configureArtifact(project)
24+
2425
project.afterEvaluate {
25-
installBinary(project, configureArtifact(project))
26+
installBinary(project)
2627
}
2728

2829
return "${getTargetDirectory(project)}/bin/$CODEGEN_NAME"
2930
}
3031

31-
private fun installBinary(project: Project, artifact: Dependency) {
32+
private fun installBinary(project: Project) {
3233
val targetDir = getTargetDirectory(project)
3334

3435
if (PROTOKT_VERSION.endsWith("-SNAPSHOT") || !targetDir.exists()) {
@@ -37,7 +38,6 @@ private fun installBinary(project: Project, artifact: Dependency) {
3738
val toolsArchive = project.zipTree(
3839
project.configurations
3940
.getByName(CODEGEN_CONFIGURATION)
40-
.fileCollection(artifact)
4141
.singleFile
4242
)
4343

@@ -48,10 +48,10 @@ private fun installBinary(project: Project, artifact: Dependency) {
4848
}
4949
}
5050

51-
private fun configureArtifact(project: Project): Dependency {
51+
private fun configureArtifact(project: Project) {
5252
project.configurations.create(CODEGEN_CONFIGURATION)
5353

54-
return project.dependencies.add(
54+
project.dependencies.add(
5555
CODEGEN_CONFIGURATION,
5656
mapOf(
5757
"group" to "com.toasttab.protokt",
@@ -60,7 +60,7 @@ private fun configureArtifact(project: Project): Dependency {
6060
"classifier" to "dist",
6161
"ext" to "zip"
6262
)
63-
)!!
63+
)
6464
}
6565

6666
private fun getTargetDirectory(project: Project) =

0 commit comments

Comments
 (0)