Skip to content

Commit 65a80aa

Browse files
committed
Add external reader support in pkl-gradle
1 parent 6c3683c commit 65a80aa

File tree

5 files changed

+60
-4
lines changed

5 files changed

+60
-4
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.pkl.gradle;
17+
18+
import java.io.Serializable;
19+
import java.util.List;
20+
import org.pkl.core.util.Nullable;
21+
22+
public record ExternalReader(String executable, @Nullable List<String> arguments)
23+
implements Serializable {
24+
public ExternalReader(String executable) {
25+
this(executable, null);
26+
}
27+
}

pkl-gradle/src/main/java/org/pkl/gradle/PklPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,8 @@ private <T extends BasePklTask, S extends BasePklSpec> void configureBaseTask(T
472472
task.getHttpProxy().set(spec.getHttpProxy());
473473
task.getHttpNoProxy().set(spec.getHttpNoProxy());
474474
task.getHttpRewrites().set(spec.getHttpRewrites());
475+
task.getExternalModuleReaders().set(spec.getExternalModuleReaders());
476+
task.getExternalResourceReaders().set(spec.getExternalResourceReaders());
475477
}
476478

477479
private List<File> getTransitiveModules(AnalyzeImportsTask analyzeTask) {

pkl-gradle/src/main/java/org/pkl/gradle/spec/BasePklSpec.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.gradle.api.provider.ListProperty;
2323
import org.gradle.api.provider.MapProperty;
2424
import org.gradle.api.provider.Property;
25+
import org.pkl.gradle.ExternalReader;
2526

2627
/** Configuration options shared between plugin features. Documented in user manual. */
2728
public interface BasePklSpec {
@@ -59,4 +60,8 @@ public interface BasePklSpec {
5960
ListProperty<String> getHttpNoProxy();
6061

6162
MapProperty<URI, URI> getHttpRewrites();
63+
64+
MapProperty<String, ExternalReader> getExternalModuleReaders();
65+
66+
MapProperty<String, ExternalReader> getExternalResourceReaders();
6267
}

pkl-gradle/src/main/java/org/pkl/gradle/task/BasePklTask.java

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,15 @@
4040
import org.gradle.api.tasks.InputFile;
4141
import org.gradle.api.tasks.InputFiles;
4242
import org.gradle.api.tasks.Internal;
43+
import org.gradle.api.tasks.Nested;
4344
import org.gradle.api.tasks.Optional;
4445
import org.gradle.api.tasks.TaskAction;
4546
import org.pkl.commons.cli.CliBaseOptions;
4647
import org.pkl.core.evaluatorSettings.Color;
48+
import org.pkl.core.evaluatorSettings.PklEvaluatorSettings;
4749
import org.pkl.core.util.LateInit;
4850
import org.pkl.core.util.Nullable;
51+
import org.pkl.gradle.ExternalReader;
4952
import org.pkl.gradle.utils.PluginUtils;
5053

5154
public abstract class BasePklTask extends DefaultTask {
@@ -145,6 +148,14 @@ public Provider<String> getEvalRootDirPath() {
145148
@Input
146149
@Optional
147150
public abstract MapProperty<URI, URI> getHttpRewrites();
151+
152+
@Input
153+
@Optional
154+
public abstract MapProperty<String, ExternalReader> getExternalModuleReaders();
155+
156+
@Input
157+
@Optional
158+
public abstract MapProperty<String, ExternalReader> getExternalResourceReaders();
148159

149160
/**
150161
* There are issues with using native libraries in Gradle plugins. As a workaround for now, make
@@ -200,8 +211,8 @@ protected CliBaseOptions getCliBaseOptions() {
200211
getHttpProxy().getOrNull(),
201212
getHttpNoProxy().getOrElse(List.of()),
202213
getHttpRewrites().getOrNull(),
203-
Map.of(),
204-
Map.of(),
214+
parseExternalReaders(getExternalModuleReaders()),
215+
parseExternalReaders(getExternalResourceReaders()),
205216
null);
206217
}
207218
return cachedOptions;
@@ -237,4 +248,15 @@ protected List<Pattern> patternsFromStrings(List<String> patterns) {
237248
@Nullable T value = provider.getOrNull();
238249
return value == null ? null : f.apply(value);
239250
}
251+
252+
protected Map<String, PklEvaluatorSettings.ExternalReader> parseExternalReaders(
253+
Provider<Map<String, ExternalReader>> provider) {
254+
return provider.getOrElse(Map.of()).entrySet().stream()
255+
.collect(
256+
Collectors.toMap(
257+
Map.Entry::getKey,
258+
(it) ->
259+
new PklEvaluatorSettings.ExternalReader(
260+
it.getValue().executable(), it.getValue().arguments())));
261+
}
240262
}

pkl-gradle/src/main/java/org/pkl/gradle/task/ModulesTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ protected CliBaseOptions getCliBaseOptions() {
164164
null,
165165
List.of(),
166166
getHttpRewrites().getOrNull(),
167-
Map.of(),
168-
Map.of(),
167+
parseExternalReaders(getExternalModuleReaders()),
168+
parseExternalReaders(getExternalResourceReaders()),
169169
null);
170170
}
171171
return cachedOptions;

0 commit comments

Comments
 (0)