Skip to content

Commit cfcd5c8

Browse files
Readme changes, deprecated options usage removal, Gradle CI fix
1 parent 5b8959e commit cfcd5c8

File tree

4 files changed

+6
-27
lines changed

4 files changed

+6
-27
lines changed

.github/workflows/native-gradle-plugin.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,8 @@ jobs:
3535
./gradlew checkstyleMain
3636
./gradlew checkstyleTest
3737
popd
38-
- name: Build and publish plugin
38+
- name: Build and test plugin
3939
run: |
4040
pushd native-gradle-plugin
41-
./gradlew publishToMavenLocal
41+
./gradlew functionalTest
4242
popd
43-
- name: Build and publish junit-platform-native feature
44-
run: |
45-
pushd common/junit-platform-native/
46-
./gradlew publishToMavenLocal
47-
popd
48-
- name: Plugin test (build native)
49-
run: |
50-
pushd examples/gradle
51-
echo "JVM run"
52-
./gradlew run
53-
echo "Native run"
54-
./gradlew nativeRun
55-
popd
56-
- name: Plugin test (test native)
57-
run: |
58-
pushd examples/gradle
59-
./gradlew clean test
60-
./gradlew nativeTest
61-
popd
62-

native-gradle-plugin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ nativeBuild {
7575
classpath("dir1", "dir2") // Adds "dir1" and "dir2" to the classpath
7676
jvmArgs("flag") // Passes 'flag' directly to the JVM running the native image builder
7777
runtimeArgs("--help") // Passes '--help' to built image, during "nativeRun" task
78-
systemProperties = [name1: 'value1', name2: 'value2'] // Sets system properties
78+
systemProperties = [name1: 'value1', name2: 'value2'] // Sets system properties for the native image builder
7979
agent = false // Can be also set on command line using '-Pagent'
8080
persistConfig = false // Used in conjunction with 'agent' to save its output to META-INF
8181
}
@@ -108,7 +108,7 @@ tasks {
108108
classpath("dir1", "dir2") // Adds "dir1" and "dir2" to the classpath
109109
jvmArgs("flag") // Passes 'flag' directly to the JVM running the native image builder
110110
runtimeArgs("--help") // Passes '--help' to built image, during "nativeRun" task
111-
systemProperties.put("key1", "value1") // Sets a system property
111+
systemProperties.put("key1", "value1") // Sets a system property for the native-image builder
112112
agent.set(false) // Can be also set on command line using '-Pagent'
113113
persistConfig.set(false) // Used in conjunction with 'agent' to save its output to META-INF
114114
}

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/tasks/NativeBuildTask.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363

6464
import static org.graalvm.buildtools.gradle.GradleUtils.DEPENDENT_CONFIGURATIONS;
6565

66-
@SuppressWarnings("unused")
6766
public abstract class NativeBuildTask extends AbstractExecTask<NativeBuildTask> {
6867
public static final String TASK_NAME = "nativeBuild";
6968

@@ -103,7 +102,7 @@ public FileCollection getInputFiles() {
103102

104103
@Input
105104
public List<String> getArgs() {
106-
return options.getArgs().get();
105+
return options.getBuildArgs().get();
107106
}
108107

109108
@OutputFile

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/tasks/TestNativeBuildTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public FileCollection getInputFiles() {
106106
@Input
107107
public List<String> getArgs() {
108108
options.configure(getProject());
109-
return options.getArgs().get();
109+
return options.getBuildArgs().get();
110110
}
111111

112112
@OutputFile

0 commit comments

Comments
 (0)