Merge robolectric/master up to commit a2fed5d

Bug: 116278591
Test: make -j56 Run_all_robolectric_tests
Change-Id: Ibf9466c62716eb64ab93b1aebd9db8e91230cf84

4 files changed, 31 insertions, 7 deletions

diff --git a/buildSrc/src/main/groovy/AndroidSdk.groovy b/buildSrc/src/main/groovy/AndroidSdk.groovy
index 216bdc641..71a288e53 100644
--- a/buildSrc/src/main/groovy/AndroidSdk.groovy
+++ b/buildSrc/src/main/groovy/AndroidSdk.groovy
@@ -9,16 +9,17 @@ class AndroidSdk implements Comparable<AndroidSdk> {
     static final N = new AndroidSdk(24, "7.0.0_r1", "r1")
     static final N_MR1 = new AndroidSdk(25, "7.1.0_r7", "r1")
     static final O = new AndroidSdk(26, "8.0.0_r4", "r1")
-    static final O_MR1 = new AndroidSdk(27, "8.1.0", "r4402310")
+    static final O_MR1 = new AndroidSdk(27, "8.1.0", "4611349")
+    static final P = new AndroidSdk(28, "9", "4913185-2");
 
     static final List<AndroidSdk> ALL_SDKS = [
             JELLY_BEAN, JELLY_BEAN_MR1, JELLY_BEAN_MR2, KITKAT,
-            LOLLIPOP, LOLLIPOP_MR1, M, N, N_MR1, O, O_MR1
+            LOLLIPOP, LOLLIPOP_MR1, M, N, N_MR1, O, O_MR1, P
     ]
 
     static final MAX_SDK = Collections.max(ALL_SDKS)
 
-    private final int apiLevel
+    public final int apiLevel
     private final String androidVersion
     private final String frameworkSdkBuildVersion
 
@@ -67,4 +68,4 @@ class AndroidSdk implements Comparable<AndroidSdk> {
     int hashCode() {
         return apiLevel
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/groovy/CheckApiChangesPlugin.groovy b/buildSrc/src/main/groovy/CheckApiChangesPlugin.groovy
index 712f77ec3..b107f6512 100644
--- a/buildSrc/src/main/groovy/CheckApiChangesPlugin.groovy
+++ b/buildSrc/src/main/groovy/CheckApiChangesPlugin.groovy
@@ -295,7 +295,7 @@ class CheckApiChangesPlugin implements Plugin<Project> {
                     case 'V': write('void'); break;
                 }
             }
-            "$methodNode.name(${args.toString()}): ${returnType.toString()}"
+            "$methodAccessString $methodNode.name(${args.toString()}): ${returnType.toString()}"
         }
 
         @Override
@@ -324,6 +324,24 @@ class CheckApiChangesPlugin implements Plugin<Project> {
                     containsAnnotation(methodNode.visibleAnnotations, "Ljava/lang/Deprecated;")
         }
 
+        String getMethodAccessString() {
+            if (bitSet(methodNode.access, ACC_PROTECTED)) {
+                return "protected"
+            }
+            if (bitSet(methodNode.access, ACC_PUBLIC)) {
+                return "public"
+            }
+        }
+
+        String getClassAccessString() {
+            if (bitSet(classNode.access, ACC_PROTECTED)) {
+                return "protected"
+            }
+            if (bitSet(classNode.access, ACC_PUBLIC)) {
+                return "public"
+            }
+        }
+
         boolean isVisible() {
             (bitSet(classNode.access, ACC_PUBLIC) || bitSet(classNode.access, ACC_PROTECTED)) &&
                     (bitSet(methodNode.access, ACC_PUBLIC) || bitSet(methodNode.access, ACC_PROTECTED)) &&
diff --git a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
index fe0f490be..b18ad6628 100644
--- a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
@@ -61,7 +61,7 @@ class RoboJavaModulePlugin implements Plugin<Project> {
             }
 
             minHeapSize = "1024m"
-            maxHeapSize = "3172m"
+            maxHeapSize = "4096m"
 
             if (System.env['GRADLE_MAX_PARALLEL_FORKS'] != null) {
                 maxParallelForks = Integer.parseInt(System.env['GRADLE_MAX_PARALLEL_FORKS'])
@@ -116,6 +116,9 @@ class RoboJavaModulePlugin implements Plugin<Project> {
                 }
             }
 
+            // for maven local install:
+            archivesBaseName = mavenArtifactName
+
             uploadArchives {
                 repositories {
                     mavenDeployer {
diff --git a/buildSrc/src/main/groovy/ShadowsPlugin.groovy b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
index 54d672a40..5d38188ef 100644
--- a/buildSrc/src/main/groovy/ShadowsPlugin.groovy
+++ b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
@@ -20,6 +20,7 @@ class ShadowsPlugin implements Plugin<Project> {
         def compileJavaTask = project.tasks["compileJava"]
         compileJavaTask.doFirst {
             options.compilerArgs.add("-Aorg.robolectric.annotation.processing.shadowPackage=${project.shadows.packageName}")
+            options.compilerArgs.add("-Aorg.robolectric.annotation.processing.sdkCheckMode=${project.shadows.sdkCheckMode}")
         }
 
         // this doesn't seem to have any effect in IDEA yet, unfortunately...
@@ -51,10 +52,11 @@ class ShadowsPlugin implements Plugin<Project> {
          * See https://discuss.gradle.org/t/gradle-not-compiles-with-solder-tooling-jar/7583/20
          */
         project.tasks.withType(JavaCompile) { options.fork = true }
-}
+    }
 
     static class ShadowsPluginExtension {
         String packageName
+        String sdkCheckMode = "WARN"
     }
 
     private static void checkForFile(jar, String name) {