Rename extension and tasks

Following conversations, we decided to name:

- `graalvmNative` the extension responsible for configuring the
GraalVM native tooling
- `binaries` the container of _native images_ in this extension.
The name `binaries` was preferred over "native images" for multiple
reasons:
   - there's a confusion in the community with the term "image"
which is often thought as "Docker images" (or VMs)
   - the term "binary" is well known in the Gradle ecosystem
   - a native image can be either an executable or a library, which
means that "binary" properly covers both cases
- `nativeBuild` becomes `nativeCompile`, to emphatize the fact that
it's a _compilation_ phase, and to remove the confusion with the
"build" phase in Gradle
- similarly `nativeTestBuild` becomes `nativeTestCompile`

Author: melix

common/docs/ANNOUNCEMENT.md

@@ -43,11 +43,11 @@ pluginManagement {
 ```
 _(this step will be redundant once this plugin is published to the Gradle Plugin Portal)._
 
-After that, we can configure the image build by using a `jvmNative` configuration block:
+After that, we can configure the image build by using a `graalvmNative` configuration block:
 
 ```groovy
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
         main {
             imageName = "my-app"
             mainClass = "org.test.Main"
@@ -58,7 +58,7 @@ jvmNative {
 }
 ```
 
-The plugin then adds `jvmNativeCompile` and `nativeRun` tasks that respectively creates a native executable and runs the main class (as one might expect ☺). If the reflection configuration is necessary for the Native Image building, this plugin also provides a simple option that activates the `[native-image-agent](https://www.graalvm.org/reference-manual/native-image/BuildConfiguration/#assisted-configuration-of-native-image-builds)` without any additional user setup. More information (and _Kotlin_ configuration syntax) is available in the [documentation](https://github.com/graalvm/native-build-tools/blob/master/native-gradle-plugin/README.md).
+The plugin then adds `nativeCompile` and `nativeRun` tasks that respectively creates a native executable and runs the main class (as one might expect ☺). If the reflection configuration is necessary for the Native Image building, this plugin also provides a simple option that activates the `[native-image-agent](https://www.graalvm.org/reference-manual/native-image/BuildConfiguration/#assisted-configuration-of-native-image-builds)` without any additional user setup. More information (and _Kotlin_ configuration syntax) is available in the [documentation](https://github.com/graalvm/native-build-tools/blob/master/native-gradle-plugin/README.md).
 
 #### Testing in _Gradle_
 

common/junit-platform-native/gradle/native-image-testing.gradle

@@ -127,7 +127,7 @@ tasks.named("test") {
     }
 }
 
-tasks.register("jvmNativeTestCompile", Exec) {
+tasks.register("nativeTestCompile", Exec) {
     dependsOn(test)
     inputs.files(test.classpath)
     workingDir "${buildDir}"
@@ -141,7 +141,7 @@ tasks.register("jvmNativeTestCompile", Exec) {
 }
 
 tasks.register("nativeTest", Exec) {
-    dependsOn jvmNativeTestCompile
+    dependsOn nativeTestCompile
     workingDir = "${buildDir}"
     executable = "${buildDir}/native-image-tests"
 }

docs/src/docs/asciidoc/gradle-plugin.adoc

@@ -131,12 +131,12 @@ This plugin works with the `application` plugin and will register a number of ta
 
 The main tasks that you will want to execute are:
 
-- `jvmNativeCompile`, which will trigger the generation of a native executable of your application
+- `nativeCompile`, which will trigger the generation of a native executable of your application
 - `nativeRun`, which executes the generated native executable
-- `jvmNativeTestCompile`, which will build a native image with tests found in the `test` source set
+- `nativeTestCompile`, which will build a native image with tests found in the `test` source set
 - `nativeTest`, which will <<testing,execute tests>> found in the `test` source set in native mode
 
-Those tasks are configured with reasonable defaults using the `jvmNative` extension `images` container of type link:javadocs/native-gradle-plugin/org/graalvm/buildtools/gradle/dsl/NativeImageOptions.html[NativeImageOptions].
+Those tasks are configured with reasonable defaults using the `graalvmNative` extension `binaries` container of type link:javadocs/native-gradle-plugin/org/graalvm/buildtools/gradle/dsl/NativeImageOptions.html[NativeImageOptions].
 
 The main executable is configured by the image named `main`, while the test executable is configured via the image named `test`.
 
@@ -152,8 +152,8 @@ If you want to use a different toolchain, for example a GraalVM Enterprise Editi
 .Selecting the GraalVM toolchain
 [role="multi-language-sample"]
 ```groovy
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
       main {
           javaLauncher = javaToolchains.launcherFor {
             languageVersion = JavaLanguageVersion.of(8)
@@ -166,8 +166,8 @@ jvmNative {
 
 [role="multi-language-sample"]
 ```kotlin
-jvmNative {
-   images {
+graalvmNative {
+   binaries {
     main {
       javaLauncher.set(javaToolchains.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(8))
@@ -185,8 +185,8 @@ The following configuration options are available for building images:
 .NativeImageOption configuration
 [role="multi-language-sample"]
 ```groovy
-jvmNative {
-  images {
+graalvmNative {
+  binaries {
     main {
       // Main options
       imageName = 'application' // The name of the native image, defaults to the project name
@@ -217,8 +217,8 @@ jvmNative {
 
 [role="multi-language-sample"]
 ```kotlin
-jvmNative {
-  images {
+graalvmNative {
+  binaries {
     main {
       // Main options
       imageName.set("application") // The name of the native image, defaults to the project name
@@ -312,7 +312,7 @@ This should be as easy as appending `-Pagent` to `run` and `nativeBuild`, or `te
 
 ```bash
 ./gradlew -Pagent run # Runs on JVM with native-image-agent.
-./gradlew -Pagent jvmNativeCompile # Builds image using configuration acquired by agent.
+./gradlew -Pagent nativeCompile # Builds image using configuration acquired by agent.
 
 # For testing
 ./gradlew -Pagent test # Runs on JVM with native-image-agent.
@@ -345,8 +345,8 @@ nativeBuild {
 you need to use:
 
 ```groovy
-jvmNative {
-  images {
+graalvmNative {
+  binaries {
     main {
       verbose = true
     }
@@ -365,17 +365,17 @@ nativeTest {
 you need to use:
 
 ```groovy
-jvmNative {
-  images {
+graalvmNative {
+  binaries {
     test {
       verbose = true
     }
   }
 }
 ```
 
-- The `nativeBuild` task has been renamed to `jvmNativeCompile`.
-- The `nativeTestBuild` task has been renamed to `jvmNativeTestCompile`.
+- The `nativeBuild` task has been renamed to `nativeCompile`.
+- The `nativeTestBuild` task has been renamed to `nativeTestCompile`.
 
 Both `nativeBuild` and `nativeTestBuild` task invocations are still supported but deprecated and will be removed in a future release.
 

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/DeprecatedExtensionFunctionalTest.groovy

@@ -57,15 +57,15 @@ class DeprecatedExtensionFunctionalTest extends AbstractFunctionalTest {
                 jvmArgs('hello', 'world')
             }
             
-            assert jvmNative.images.${replacedWith}.verbose.get() == true
-            assert jvmNative.images.${replacedWith}.jvmArgs.get() == ['hello', 'world']
+            assert graalvmNative.binaries.${replacedWith}.verbose.get() == true
+            assert graalvmNative.binaries.${replacedWith}.jvmArgs.get() == ['hello', 'world']
         """
 
         when:
         run 'help'
 
         then:
-        outputContains "The $extensionName extension is deprecated and will be removed. Please use the 'jvmNative.images.$replacedWith' extension to configure the native image instead."
+        outputContains "The $extensionName extension is deprecated and will be removed. Please use the 'graalvmNative.binaries.$replacedWith' extension to configure the native image instead."
 
         where:
         extensionName | replacedWith
@@ -84,12 +84,12 @@ class DeprecatedExtensionFunctionalTest extends AbstractFunctionalTest {
 
         then:
         tasks {
-            succeeded ':jvmNativeCompile'
+            succeeded ':nativeCompile'
             succeeded ':nativeBuild'
         }
 
         and:
-        outputContains 'Task nativeBuild is deprecated. Use jvmNativeCompile instead.'
+        outputContains 'Task nativeBuild is deprecated. Use nativeCompile instead.'
 
         where:
         version << TESTED_GRADLE_VERSIONS

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationFunctionalTest.groovy

@@ -46,7 +46,7 @@ import org.graalvm.buildtools.gradle.fixtures.AbstractFunctionalTest
 class JavaApplicationFunctionalTest extends AbstractFunctionalTest {
     def "can build a native image for a simple application"() {
         gradleVersion = version
-        def nativeApp = file("build/native/jvmNativeCompile/java-application")
+        def nativeApp = file("build/native/nativeCompile/java-application")
         debug  = true
 
         given:
@@ -59,11 +59,11 @@ class JavaApplicationFunctionalTest extends AbstractFunctionalTest {
         """.stripIndent()
 
         when:
-        run 'jvmNativeCompile'
+        run 'nativeCompile'
 
         then:
         tasks {
-            succeeded ':jar', ':jvmNativeCompile'
+            succeeded ':jar', ':nativeCompile'
             doesNotContain ':build', ':run'
         }
 

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationWithResourcesFunctionalTest.groovy

@@ -47,7 +47,7 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractFunctionalTest
     @Unroll("can build an application which uses resources using #pattern on Gradle #version with JUnit Platform #junitVersion")
     def "can build an application which uses resources"() {
         gradleVersion = version
-        def nativeApp = file("build/native/jvmNativeCompile/java-application")
+        def nativeApp = file("build/native/nativeCompile/java-application")
         debug = true
         given:
         withSample("java-application-with-resources")
@@ -60,11 +60,11 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractFunctionalTest
         """
 
         when:
-        run 'jvmNativeCompile'
+        run 'nativeCompile'
 
         then:
         tasks {
-            succeeded ':jar', ':jvmNativeCompile'
+            succeeded ':jar', ':nativeCompile'
             doesNotContain ':build', ':run'
         }
 
@@ -92,8 +92,8 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractFunctionalTest
         junitVersion = System.getProperty('versions.junit')
         [version, [pattern, config]] << [TESTED_GRADLE_VERSIONS,
                                          [["explicit resource declaration", """
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
         main {
             resources {
                 includedPatterns.add(java.util.regex.Pattern.quote("message.txt"))
@@ -103,8 +103,8 @@ jvmNative {
 }
 """],
                                          ["detected", """
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
         main {
             resources {
                 autodetection {
@@ -119,8 +119,8 @@ jvmNative {
 """
                                          ],
                                           ["project local detection only", """
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
         main {
             resources {
                 autodetection {
@@ -171,8 +171,8 @@ jvmNative {
         junitVersion = System.getProperty('versions.junit')
         [version, [pattern, config]] << [TESTED_GRADLE_VERSIONS,
                                          [["explicit resource declaration", """
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
         test {
             resources {
                 includedPatterns.add(java.util.regex.Pattern.quote("message.txt"))
@@ -183,8 +183,8 @@ jvmNative {
 }
 """],
                                          ["detected", """
-jvmNative {
-    images {
+graalvmNative {
+    binaries {
         test {
             resources {
                 autodetection {

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationWithTestsFunctionalTest.groovy

@@ -49,17 +49,17 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
     @Unroll("can execute tests in a native image on Gradle #version with JUnit Platform #junitVersion")
     def "can build a native image and run it"() {
         gradleVersion = version
-        def nativeTestsApp = file("build/native/jvmNativeTestCompile/java-application-tests")
+        def nativeTestsApp = file("build/native/nativeTestCompile/java-application-tests")
 
         given:
         withSample("java-application-with-tests")
 
         when:
-        run 'jvmNativeTestCompile'
+        run 'nativeTestCompile'
 
         then:
         tasks {
-            succeeded ':testClasses', ':jvmNativeTestCompile'
+            succeeded ':testClasses', ':nativeTestCompile'
             // doesNotContain ':build'
         }
         outputDoesNotContain "Running in 'test discovery' mode. Note that this is a fallback mode."
@@ -105,7 +105,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
         then:
         tasks {
             succeeded ':testClasses',
-                    ':jvmNativeTestCompile',
+                    ':nativeTestCompile',
                     ':test', // there should probably not be a dependency here
                     ':nativeTest'
             doesNotContain ':build'

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaLibraryFunctionalTest.groovy

@@ -57,18 +57,18 @@ class JavaLibraryFunctionalTest extends AbstractFunctionalTest {
             libExt = ".dylib"
         }
 
-        def library = file("build/native/jvmNativeCompile/java-library" + libExt)
+        def library = file("build/native/nativeCompile/java-library" + libExt)
         debug  = true
 
         given:
         withSample("java-library")
 
         when:
-        run 'jvmNativeCompile'
+        run 'nativeCompile'
 
         then:
         tasks {
-            succeeded ':jar', ':jvmNativeCompile'
+            succeeded ':jar', ':nativeCompile'
             doesNotContain ':build'
         }
 

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/KotlinApplicationWithTestsFunctionalTest.groovy

@@ -60,7 +60,7 @@ class KotlinApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
         then:
         tasks {
             succeeded ':compileTestKotlin',
-                    ':jvmNativeTestCompile',
+                    ':nativeTestCompile',
                     ':test',
                     ':nativeTest'
             doesNotContain ':build'

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/MultiProjectJavaApplicationWithTestsFunctionalTest.groovy

@@ -59,7 +59,7 @@ class MultiProjectJavaApplicationWithTestsFunctionalTest extends AbstractFunctio
         tasks {
             succeeded ':utils:jar',
                     ':core:testClasses',
-                    ':core:jvmNativeTestCompile',
+                    ':core:nativeTestCompile',
                     ':core:nativeTest'
             doesNotContain ':core:build'
         }