Merge pull request #101 from kennethshackleton/java-11

Support Java 11.
bloomberg · May 8, 2021 · 73aa257 · 73aa257
2 parents cbfb821 + 53a77fc
commit 73aa257
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -22,7 +22,7 @@ jobs:
         submodules: true
     - uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: 'Configure local.properties'
       run: |
         echo "sdk.dir=${ANDROID_HOME}" > local.properties

diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -24,7 +24,7 @@ jobs:
         submodules: true
     - uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: 'Configure local.properties'
       run: |
         echo "sdk.dir=${ANDROID_HOME}" > local.properties

diff --git a/.github/workflows/publish-documentation.yml b/.github/workflows/publish-documentation.yml
@@ -26,7 +26,7 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - uses: actions/setup-python@v2
         with:
           python-version: 3.8

diff --git a/buildSrc/src/main/kotlin/JacocoAndroidPlugin.kt b/buildSrc/src/main/kotlin/JacocoAndroidPlugin.kt
@@ -33,7 +33,10 @@ class JacocoAndroidPlugin : Plugin<Project> {
                     else -> error("Unrecognised Android project type for project '$name'.")
                 }.all {
                     val testTask = this@run.tasks.unitTestTask(this@all).apply {
-                        jacocoTaskExtension().isIncludeNoLocationClasses = true
+                        jacocoTaskExtension().let {
+                            it.isIncludeNoLocationClasses = true
+                            it.excludes = listOf("jdk.internal.*")
+                        }
                     }
                     tasks.register(
                         "jacocoTest${name.capitalize(Locale.US)}UnitTestReport",

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ openssl.sha256=1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
 openssl.pgp.sha256=f3fd3299a79421fffd51d35f62636b8e987dab1d3033d93a19d7685868e15395
 
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms256m -Xmx2048m -XX:MaxPermSize=1024m
+org.gradle.jvmargs=-Xms256m -Xmx2048m -XX:MaxPermSize=1024m -XX:+UseParallelGC
 org.gradle.parallel=true
 
 kotlin.code.style=official