Prepare 1.0.10

mannodermaus · Oct 10, 2017 · 8028617 · 8028617
2 parents a16af5a + a47b368
commit 8028617
Show file tree

Hide file tree

Showing 22 changed files with 1,700 additions and 1,319 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 local.properties
 .idea/*
 !.idea/runConfigurations
+!.idea/codeStyleSettings.xml
 .DS_Store
 build/
 captures/
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-26.0.1
+  - build-tools-26.0.2
   - android-26
 
 jdk:

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ A Gradle plugin that allows for the execution of [JUnit 5][junit5gh] unit tests
 ```groovy
 buildscript {
     dependencies {
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.0"
+        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.10"
     }
 }
 ```
@@ -27,51 +27,104 @@ dependencies {
 
     // (Optional) If you need "parameterized tests"
     testImplementation junit5Params()
-    
-    // For Android Studio users:
-    //
-    // All versions up to and including AS 3.0 Beta 5 use a build of IntelliJ IDEA
-    // that depends on APIs of an outdated Milestone Release of JUnit 5.
-    // Therefore, your tests will fail with a NoSuchMethodError
-    // when executed from Android Studio directly.
-    //
-    // To prevent this, there is a separate library you can apply here.
-    // It provides a copy of the JUnit 5 Runtime used in a more recent build
-    // of IntelliJ, overriding the one embedded in Android Studio.
-    //
-    // Please note the version of this dependency! There was an issue with the deployment
-    // of the "1.0.0" JAR, so that one actually won't work as advertised. Please explicitly
-    // depend on this version instead; there won't be any incompatibilities with the main plugin,
-    // since this doesn't share any connection with it. Sorry for the inconvenience!
-    testCompileOnly "de.mannodermaus.gradle.plugins:android-junit5-embedded-runtime:1.0.0-RC3-rev1"
 }
 ```
 
 ## Usage
 
-This plugin configures the `junitPlatform` task for each registered build variant of a project.
-It automatically attaches both the Jupiter & Vintage Engines during the execution phase of your tests.
+This plugin configures a `junitPlatformTest` task for each registered build variant of a project.
+It automatically attaches both the Jupiter & Vintage Engines during the execution phase of your tests as well.
 
 More instructions on how to write JUnit 5 tests can be found [in their User Guide][junit5ug].
 Furthermore, this repository provides a small showcase of the functionality provided by JUnit 5 [here][sampletests].
 
+## Android Studio Workarounds
+
+> **Note:**
+> 
+> The following section deals with fixing Test Execution within **Android Studio 3**.
+> Running your JUnit 5 tests directly from Android Studio 2.3.3 and earlier **will not work**:
+> You will encounter an `AbstractMethodError` when trying to do so ([more information here][as2issue]).
+> 
+> The cause of this error is similar in nature to the one described below, and related to outdated APIs.
+> Unlike that issue though, we can't fix the `AbstractMethodError` inside IntelliJ's internal runtime
+> in the same way. Therefore, please resort to using Gradle for unit testing in Android Studio 2.
+
+
+All versions up to and including **Android Studio 3.0 Beta 7** are built
+on a version of IntelliJ IDEA that depends on outdated JUnit 5 APIs.
+Therefore, your tests will fail with an Exception similar to the following when you try to
+launch your tests from inside the IDE (using an *Android JUnit* Run Configuration):
+
+```
+Exception in thread "main" java.lang.NoSuchMethodError: org.junit.platform.launcher.Launcher.execute(Lorg/junit/platform/launcher/LauncherDiscoveryRequest;)V
+	at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:42)
+	...
+```
+
+To work around this, there is a separate dependency you can add to the *test* scope
+of your project in Android Studio 3. It provides its own copy of the JUnit 5 Runtime
+provided by a more recent build of IntelliJ, overriding the one embedded in Android Studio.
+
+To use this, add the following line alongside the other `junit5()` dependencies:
+
+```groovy
+testCompileOnly junit5EmbeddedRuntime()
+```
+
+*As mentioned above, this will **only** fix Test Execution from Android Studio 3.*
+
 ## Extras
 
+### Override Dependency Versions
+
 Inside the configuration closure applied by the plugin, you can specify the same properties as you would
 for a Java-based project with the JUnit Platform Gradle plugin.
 However, there are some additional properties that you can apply:
 
 ```groovy
 junitPlatform {
     // The JUnit Jupiter dependency version to use; matches the platform's version by default
-    jupiterVersion "5.0.0"
+    jupiterVersion "5.0.1"
     // The JUnit Vintage Engine dependency version to use; matches the platform's version by default
-    vintageVersion "4.12.0"
+    vintageVersion "4.12.1"
 }
 ```
 
+### JaCoCo Integration
+
+If the plugin detects the usage of [JaCoCo][jacoco] inside a project that it's being applied to,
+it will automatically configure additional tasks to report the unit test coverage
+of your application based on its JUnit 5 tests.
+There is no additional setup required to enable this behaviour.
+You can however customize the reports JaCoCo should generate.
+
+Configuration is applied through the `jacoco` clause inside the plugin's DSL:
+
+```groovy
+junitPlatform {
+  jacoco {
+    csvReport true
+    xmlReport true
+    htmlReport true
+  }
+}
+```
+
+## License
+
+`android-junit5` is distributed with multiple Open Source licenses:
+
+- `android-junit5-embedded-runtime` uses [Apache License v2.0](android-junit5-embedded-runtime/LICENSE.md)
+- All other modules use [Eclipse Public License v2.0](android-junit5/LICENSE.md)
+
+Please see the `LICENSE.md` files in the subfolders for more details.
+
  [junit5gh]: https://github.com/junit-team/junit5
  [junit5ug]: http://junit.org/junit5/docs/current/user-guide
  [travisci]: https://travis-ci.org/mannodermaus/android-junit5
- [sonatyperepo]: https://oss.sonatype.org/content/repositories/snapshots
+ [as2issue]: https://github.com/mannodermaus/android-junit5/issues/19
+ [jacoco]: http://www.eclemma.org/jacoco
+ [sonatyperepo]: https://oss.sonatype.org/content/repositories/snapshots/de/mannodermaus/gradle/plugins
  [sampletests]: sample/src/test
+ [licensefile]: LICENSE.md
diff --git a/android-junit5-embedded-runtime/build.gradle b/android-junit5-embedded-runtime/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "com.github.jengelman.gradle.plugins:shadow:$SHADOW_PLUGIN_VERSION"
-    }
+  repositories {
+    jcenter()
+  }
+  dependencies {
+    classpath "com.github.jengelman.gradle.plugins:shadow:$SHADOW_PLUGIN_VERSION"
+  }
 }
 
 apply plugin: "java-library"
@@ -13,25 +13,25 @@ apply plugin: "maven-publish"
 apply plugin: "com.github.johnrengelman.shadow"
 apply plugin: "com.jfrog.bintray"
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
-
 // ------------------------------------------------------------------------------------------------
 // Dependency Definitions
-// This module exports a "fat JAR" with the embedded junit5-rt from IntelliJ IDEA,
+// This module exports a "fat JAR" containing embedded JARs from IntelliJ IDEA,
 // using a shadowed JAR that overrides the default build artifact.
+//
+// Path to this JAR inside an IntelliJ IDEA package:
+// "plugins/junit/lib/junit5-rt.jar"
 // ------------------------------------------------------------------------------------------------
 
 dependencies {
-    implementation files("libs/junit5-rt.jar")
+  implementation files("libs/junit5-rt.jar")
 }
 
 shadowJar {
-    // Remove '-all' suffix from the generated JAR
-    classifier = null
+  // Remove '-all' suffix from the generated JAR
+  classifier = null
 }
 
-build.doLast { shadowJar.execute() }
+build.finalizedBy shadowJar
 
 // ------------------------------------------------------------------------------------------------
 // Deployment Setup
@@ -42,76 +42,75 @@ build.doLast { shadowJar.execute() }
 
 // Include sources.jar archive in each release
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+  classifier = "sources"
+  from sourceSets.main.allSource
 }
 
 // Include javadoc.jar archive in each release
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
-    from javadoc.destinationDir
+  classifier = "javadoc"
+  from javadoc.destinationDir
 }
 
 artifacts {
-    archives sourcesJar
-    archives javadocJar
+  archives sourcesJar
+  archives javadocJar
 }
 
 version = VERSION_NAME
 
 publishing {
-    publications {
-        library(MavenPublication) {
-            project.shadow.component(it)
-        }
+  publications {
+    library(MavenPublication) {
+      project.shadow.component(it)
     }
+  }
 }
 
 // Copy POM to location expected by Bintray
 task copyPom(type: Copy) {
-    from "build/publications/library"
-    into "build/poms"
-    include "pom-default.xml"
+  from "build/publications/library"
+  into "build/poms"
+  include "pom-default.xml"
 }
 
 publish.dependsOn copyPom
 
 project.configure(project) {
-    if (project.version.endsWith("-SNAPSHOT")) {
-        // Configure deployment of snapshot versions to Sonatype OSS
-        project.publishing {
-            repositories {
-                maven {
-                    name "snapshot"
-                    credentials {
-                        username project.ext.sonatypeUser
-                        password project.ext.sonatypePass
-                    }
-                    url "https://oss.sonatype.org/content/repositories/snapshots"
-                }
-            }
+  if (project.version.endsWith("-SNAPSHOT")) {
+    // Configure deployment of snapshot versions to Sonatype OSS
+    project.publishing {
+      repositories {
+        maven {
+          name "snapshot"
+          credentials {
+            username project.ext.sonatypeUser
+            password project.ext.sonatypePass
+          }
+          url "https://oss.sonatype.org/content/repositories/snapshots"
         }
-
-    } else {
-        // Configure deployment of release versions to Bintray
-        project.bintray {
-            user = project.ext.bintrayUser
-            key = project.ext.bintrayKey
-            configurations = ["archives"]
-            dryRun = false
-            pkg {
-                repo = "maven"
-                name = RUNTIME_ARTIFACT_ID
-                userOrg = project.ext.bintrayUser
-                licenses = [RUNTIME_LICENSE_NAME]
-                publish = true
-                publicDownloadNumbers = true
-                vcsUrl = VCS_URL
-                version {
-                    name = VERSION_NAME
-                    desc = RUNTIME_DESCRIPTION
-                }
-            }
+      }
+    }
+  } else {
+    // Configure deployment of release versions to Bintray
+    project.bintray {
+      user = project.ext.bintrayUser
+      key = project.ext.bintrayKey
+      configurations = ["archives"]
+      dryRun = false
+      pkg {
+        repo = "maven"
+        name = RUNTIME_ARTIFACT_ID
+        userOrg = project.ext.bintrayUser
+        licenses = [RUNTIME_LICENSE_NAME]
+        publish = true
+        publicDownloadNumbers = true
+        vcsUrl = VCS_URL
+        version {
+          name = VERSION_NAME
+          desc = RUNTIME_DESCRIPTION
         }
+      }
     }
+  }
 }