Refactor CreateDmg and BundleMacosJdk: use Property<..>, migrate to K…

…otlin

.github/workflows/gradle.yml

@@ -12,6 +12,26 @@ jobs:
     strategy:
       matrix:
         java: [1.8, 11, 13]
+    name: 'ubuntu (JDK ${{ matrix.java }}) '
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.java }}
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew test
+
+  build-macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        java: [1.8, 11]
+
+    name: 'macOS (JDK ${{ matrix.java }}) '
 
     steps:
     - uses: actions/checkout@v2

README.md

@@ -81,30 +81,56 @@ created by an MPS-generated Ant script), a JDK, and a background image.
 
 ### Usage
 
-```
+Groovy:
+
+```gradle
 task buildDmg(type: de.itemis.mps.gradle.CreateDmg) {
-    rcpArtifact file('path/to/RCP.tgz')
+    rcpArtifact = file('path/to/RCP.tgz')
 
     jdkDependency "com.jetbrains.jdk:jdk:${jdkVersion}:osx_x64@tgz"
     // -or -
-    jdk file('path/to/jdk.tgz')
+    jdk = file('path/to/jdk.zip')
+
+    backgroundImage = file('path/to/background.png')
+    dmgFile = file('output.dmg')
+
+    signKeyChain = file("/path/to/my.keychain-db")
+
+    signKeyChainPassword = "my.keychain-db-password"
+
+    signIdentity = "my Application ID Name"
+}
+```
+
+Kotlin:
+
+```kotlin
+import de.itemis.mps.gradle.CreateDmg
 
-    backgroundImage file('path/to/background.png')
-    dmgFile file('output.dmg')
+val buildDmg by tasks.registering(CreateDmg::class) {
+    rcpArtifact.set(file("path/to/RCP.tgz"))
 
-    signKeyChain file("/path/to/my.keychain-db")
+    jdkDependency("com.jetbrains.jdk:jdk:${jdkVersion}:osx_x64@tgz")
+    // -or-
+    jdk.set(layout.file(provider { jdkConfiguration.singleFile }))
+    // -or-
+    jdk.set(file("path/to/jdk.zip"))
 
-    signKeyChainPassword "my.keychain-db-password"
+    backgroundImage.set(file("path/to/background.png"))
+    dmgFile.set(file("output.dmg"))
 
-    signIdentity "my Application ID Name"
+    // Below properties must be all present or they all must be absent
+    signKeyChain.set(file("/path/to/my.keychain-db"))
+    signKeyChainPassword.set("my.keychain-db-password")
+    signIdentity.set("my Application ID Name")
 }
 ```
 
 Parameters:
 * `rcpArtifact` - the path to the RCP artifact produced by a build script.
 * `jdkDependency` - the coordinates of a JDK in case it's available in
   a repository and can be resolved as a Gradle dependency.
-* `jdk` - the path to a JDK .tgz file.
+* `jdk` - the path to a JDK .zip file.
 * `backgroundImage` - the path to the background image.
 * `dmgFile` - the path and file name of the output DMG image. Must end
   with `.dmg`.
@@ -129,23 +155,43 @@ task.
 
 ### Usage
 
-```
+Groovy:
+
+```gradle
 task bundleMacosJdk(type: de.itemis.mps.gradle.BundleMacosJdk) {
-    rcpArtifact file('path/to/RCP.tgz')
+    rcpArtifact = file('path/to/RCP.tgz')
 
     jdkDependency "com.jetbrains.jdk:jdk:${jdkVersion}:osx_x64@tgz"
     // -or -
-    jdk file('path/to/jdk.tgz')
+    jdk = file('path/to/jdk.tgz')
+
+    outputFile = file('output.tar.gz')
+}
+```
+
+Kotlin:
+
+```kotlin
+import de.itemis.mps.gradle.BundleMacosJdk
+
+val buildDmg by tasks.registering(BundleMacosJdk::class) {
+    rcpArtifact.set(file("path/to/RCP.tgz"))
+
+    jdkDependency("com.jetbrains.jdk:jdk:${jdkVersion}:osx_x64@tgz")
+    // -or-
+    jdk.set(layout.file(provider { jdkConfiguration.singleFile }))
+    // -or-
+    jdk.set(file("path/to/jdk.tgz"))
 
-    outputFile file('output.tar.gz')
+    outputFile.set(file("output.dmg"))
 }
 ```
 
 Parameters:
 * `rcpArtifact` - the path to the RCP artifact produced by a build script.
 * `jdkDependency` - the coordinates of a JDK in case it's available in
   a repository and can be resolved as a Gradle dependency.
-* `jdk` - the path to a JDK .tgz file.
+* `jdk` - the path to a JDK .zip file.
 * `outputFile` - the path and file name of the output gzipped tar archive.
 
 ### Operation

build.gradle.kts

@@ -1,5 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URI
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 buildscript {
     configurations.classpath {
@@ -20,7 +21,7 @@ plugins {
 }
 
 val versionMajor = 1
-val versionMinor = 4
+val versionMinor = 5
 
 group = "de.itemis.mps"
 
@@ -133,10 +134,23 @@ dependencies {
     testRuntimeOnly(files(tasks["createClasspathManifest"]))
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions.apiVersion = kotlinApiVersion
-    kotlinOptions.allWarningsAsErrors = true
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        apiVersion = kotlinApiVersion
+        allWarningsAsErrors = true
+    }
+}
+
+tasks.withType<Test>().configureEach {
+    useJUnit()
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+    }
+}
+
+kotlinDslPluginOptions {
+    experimentalWarning.set(false)
 }