Change android source set to match the default folders

resources -> res
javaResources -> resources

Change-Id: Ib46106f0a0f365c310ae6e19ab79394caeaca7b0

5 files changed, 32 insertions, 29 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/AndroidSourceSet.groovy b/gradle/src/main/groovy/com/android/build/gradle/AndroidSourceSet.groovy
index d337ec7..583c508 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/AndroidSourceSet.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/AndroidSourceSet.groovy
@@ -30,24 +30,26 @@ public interface AndroidSourceSet {
     String getName();
 
     /**
-     * Returns the Java javaResources which are to be copied into the javaResources output directory.
+     * Returns the Java resources which are to be copied into the javaResources output directory.
      *
-     * @return the javaResources. Never returns null.
+     * @return the java resources. Never returns null.
      */
-    SourceDirectorySet getJavaResources();
+    SourceDirectorySet getResources();
 
     /**
-     * Configures the Java javaResources for this set.
+     * Configures the Java resources for this set.
      *
-     * <p>The given closure is used to configure the {@link SourceDirectorySet} which contains the javaResources.
+     * <p>The given closure is used to configure the {@link SourceDirectorySet} which contains the
+     * java resources.
      *
      * @param configureClosure The closure to use to configure the javaResources.
      * @return this
      */
-    AndroidSourceSet javaResources(Closure configureClosure);
+    AndroidSourceSet resources(Closure configureClosure);
 
     /**
-     * Returns the Java source which is to be compiled by the Java compiler into the class output directory.
+     * Returns the Java source which is to be compiled by the Java compiler into the class output
+     * directory.
      *
      * @return the Java source. Never returns null.
      */
@@ -56,7 +58,8 @@ public interface AndroidSourceSet {
     /**
      * Configures the Java source for this set.
      *
-     * <p>The given closure is used to configure the {@link SourceDirectorySet} which contains the Java source.
+     * <p>The given closure is used to configure the {@link SourceDirectorySet} which contains the
+     * Java source.
      *
      * @param configureClosure The closure to use to configure the Java source.
      * @return this
@@ -64,8 +67,8 @@ public interface AndroidSourceSet {
     AndroidSourceSet java(Closure configureClosure);
 
     /**
-     * All Java source files for this source set. This includes, for example, source which is directly compiled, and
-     * source which is indirectly compiled through joint compilation.
+     * All Java source files for this source set. This includes, for example, source which is
+     * directly compiled, and source which is indirectly compiled through joint compilation.
      *
      * @return the Java source. Never returns null.
      */
@@ -93,8 +96,8 @@ public interface AndroidSourceSet {
     AndroidSourceFile getManifest();
     AndroidSourceSet manifest(Closure configureClosure);
 
-    AndroidSourceDirectory getResources();
-    AndroidSourceSet resources(Closure configureClosure);
+    AndroidSourceDirectory getRes();
+    AndroidSourceSet res(Closure configureClosure);
 
     AndroidSourceDirectory getAssets();
     AndroidSourceSet assets(Closure configureClosure);
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
index cd045df..72c59e5 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
@@ -69,9 +69,9 @@ class BaseExtension {
                             sourceSet.getName()));
 
             sourceSet.getJava().srcDir(String.format("src/%s/java", sourceSet.getName()));
-            sourceSet.getJavaResources().srcDir(
+            sourceSet.getResources().srcDir(
                     String.format("src/%s/resources", sourceSet.getName()));
-            sourceSet.getResources().srcDir(String.format("src/%s/res", sourceSet.getName()));
+            sourceSet.getRes().srcDir(String.format("src/%s/res", sourceSet.getName()));
             sourceSet.getAssets().srcDir(String.format("src/%s/assets", sourceSet.getName()));
             sourceSet.getManifest().srcFile(
                     String.format("src/%s/AndroidManifest.xml", sourceSet.getName()));
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index 30d7a18..c68ec3e 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -265,14 +265,14 @@ abstract class BasePlugin {
                 ProcessResources.class);
 
         // set the input
-        processResources.from(((AndroidSourceSet) config.defaultSourceSet).javaResources)
+        processResources.from(((AndroidSourceSet) config.defaultSourceSet).resources)
 
         if (config.getType() != VariantConfiguration.Type.TEST) {
-            processResources.from(((AndroidSourceSet) config.buildTypeSourceSet).javaResources)
+            processResources.from(((AndroidSourceSet) config.buildTypeSourceSet).resources)
         }
         if (config.hasFlavors()) {
             for (SourceProvider flavorSourceSet : config.flavorSourceSets) {
-                processResources.from(((AndroidSourceSet) flavorSourceSet).javaResources)
+                processResources.from(((AndroidSourceSet) flavorSourceSet).resources)
             }
         }
 
diff --git a/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
index 8c57944..a5ca293 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
@@ -165,8 +165,8 @@ class LibraryPlugin extends BasePlugin implements Plugin<Project> {
         Copy packageRes = project.tasks.add("package${variant.name}Res", Copy)
         // packageRes from 3 sources. the order is important to make sure the override works well.
         // TODO: fix the case of values -- need to merge the XML!
-        packageRes.from(defaultConfigData.sourceSet.resources.directory,
-                buildTypeData.sourceSet.resources.directory)
+        packageRes.from(defaultConfigData.sourceSet.res.directory,
+                buildTypeData.sourceSet.res.directory)
         packageRes.into(project.file("$project.buildDir/$DIR_BUNDLES/${variant.dirName}/res"))
 
         // package the aidl files into the bundle folder
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceSet.java b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceSet.java
index 7c7b26d..6821d7f 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceSet.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultAndroidSourceSet.java
@@ -41,7 +41,7 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider
     private final SourceDirectorySet javaResources;
     private final AndroidSourceFile manifest;
     private final AndroidSourceDirectory assets;
-    private final AndroidSourceDirectory resources;
+    private final AndroidSourceDirectory res;
     private final AndroidSourceDirectory aidl;
     private final AndroidSourceDirectory renderscript;
     private final AndroidSourceDirectory jni;
@@ -81,7 +81,7 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider
         assets = new DefaultAndroidSourceDirectory(assetsDisplayName, fileResolver);
 
         String resourcesDisplayName = String.format("%s resources", displayName);
-        resources = new DefaultAndroidSourceDirectory(resourcesDisplayName, fileResolver);
+        res = new DefaultAndroidSourceDirectory(resourcesDisplayName, fileResolver);
 
         String aidlDisplayName = String.format("%s aidl", displayName);
         aidl = new DefaultAndroidSourceDirectory(aidlDisplayName, fileResolver);
@@ -137,13 +137,13 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider
     }
 
     @Override
-    public AndroidSourceDirectory getResources() {
-        return resources;
+    public AndroidSourceDirectory getRes() {
+        return res;
     }
 
     @Override
-    public AndroidSourceSet resources(Closure configureClosure) {
-        ConfigureUtil.configure(configureClosure, getResources());
+    public AndroidSourceSet res(Closure configureClosure) {
+        ConfigureUtil.configure(configureClosure, getRes());
         return this;
     }
 
@@ -208,13 +208,13 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider
     }
 
     @Override
-    public SourceDirectorySet getJavaResources() {
+    public SourceDirectorySet getResources() {
         return javaResources;
     }
 
     @Override
-    public AndroidSourceSet javaResources(Closure configureClosure) {
-        ConfigureUtil.configure(configureClosure, getJavaResources());
+    public AndroidSourceSet resources(Closure configureClosure) {
+        ConfigureUtil.configure(configureClosure, getResources());
         return this;
     }
 
@@ -247,7 +247,7 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider
 
     @Override
     public File getResourcesDir() {
-        return getResources().getDirectory();
+        return getRes().getDirectory();
     }
 
     @Override