Refactor dependency classes in their package.
Xavier Ducrohet [Fri, 15 Mar 2013 19:24:45 +0000 (12:24 -0700)]
Change-Id: I6ccebb0bc4c5ff1a25c166bd17b00cfa6d8acdc7

16 files changed:
builder/src/main/java/com/android/builder/AndroidBuilder.java
builder/src/main/java/com/android/builder/VariantConfiguration.java
builder/src/main/java/com/android/builder/dependency/AndroidDependency.java [moved from builder/src/main/java/com/android/builder/AndroidDependency.java with 98% similarity]
builder/src/main/java/com/android/builder/dependency/BundleDependency.java [moved from builder/src/main/java/com/android/builder/BundleDependency.java with 99% similarity]
builder/src/main/java/com/android/builder/dependency/DependencyContainer.java [moved from builder/src/main/java/com/android/builder/DependencyContainer.java with 97% similarity]
builder/src/main/java/com/android/builder/dependency/JarDependency.java [moved from builder/src/main/java/com/android/builder/JarDependency.java with 97% similarity]
builder/src/main/java/com/android/builder/dependency/ManifestDependency.java [moved from builder/src/main/java/com/android/builder/ManifestDependency.java with 96% similarity]
builder/src/main/java/com/android/builder/dependency/ManifestProvider.java [moved from builder/src/main/java/com/android/builder/ManifestProvider.java with 95% similarity]
builder/src/main/java/com/android/builder/dependency/SymbolFileProvider.java [moved from builder/src/main/java/com/android/builder/SymbolFileProvider.java with 95% similarity]
gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
gradle/src/main/groovy/com/android/build/gradle/internal/AndroidAsciiReportRenderer.java
gradle/src/main/groovy/com/android/build/gradle/internal/dependency/AndroidDependencyImpl.java
gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ConfigurationDependencies.groovy
gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ManifestDependencyImpl.java
gradle/src/main/groovy/com/android/build/gradle/internal/dependency/SymbolFileProviderImpl.java

index 5379077..23b6879 100644 (file)
@@ -21,6 +21,8 @@ import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.annotations.VisibleForTesting;
 import com.android.builder.compiling.DependencyFileProcessor;
+import com.android.builder.dependency.ManifestDependency;
+import com.android.builder.dependency.SymbolFileProvider;
 import com.android.builder.internal.BuildConfigGenerator;
 import com.android.builder.internal.CommandLineRunner;
 import com.android.builder.internal.SymbolLoader;
index 77523b1..59e5c74 100644 (file)
@@ -19,6 +19,9 @@ package com.android.builder;
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.annotations.VisibleForTesting;
+import com.android.builder.dependency.AndroidDependency;
+import com.android.builder.dependency.DependencyContainer;
+import com.android.builder.dependency.JarDependency;
 import com.android.builder.resources.AssetSet;
 import com.android.builder.resources.ResourceSet;
 import com.android.builder.signing.SigningConfig;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder;
+package com.android.builder.dependency;
 
 import com.android.SdkConstants;
 import com.android.annotations.NonNull;
index 65aee56..872bf2f 100644 (file)
@@ -48,10 +48,10 @@ import com.android.build.gradle.tasks.ProcessTestManifest
 import com.android.build.gradle.tasks.RenderscriptCompile
 import com.android.build.gradle.tasks.ZipAlign
 import com.android.builder.AndroidBuilder
-import com.android.builder.AndroidDependency
+import com.android.builder.dependency.AndroidDependency
 import com.android.builder.DefaultSdkParser
-import com.android.builder.JarDependency
-import com.android.builder.ManifestDependency
+import com.android.builder.dependency.JarDependency
+import com.android.builder.dependency.ManifestDependency
 import com.android.builder.PlatformSdkParser
 import com.android.builder.ProductFlavor
 import com.android.builder.SdkParser
index 6400a65..3be6c08 100644 (file)
@@ -21,12 +21,12 @@ import com.android.build.gradle.internal.ProductFlavorData
 import com.android.build.gradle.internal.ProductionAppVariant
 import com.android.build.gradle.internal.TestAppVariant
 import com.android.build.gradle.internal.dependency.ConfigurationDependencies
-import com.android.builder.AndroidDependency
+import com.android.builder.dependency.AndroidDependency
 import com.android.builder.BuilderConstants
-import com.android.builder.BundleDependency
-import com.android.builder.DependencyContainer
-import com.android.builder.JarDependency
-import com.android.builder.ManifestDependency
+import com.android.builder.dependency.BundleDependency
+import com.android.builder.dependency.DependencyContainer
+import com.android.builder.dependency.JarDependency
+import com.android.builder.dependency.ManifestDependency
 import com.android.builder.VariantConfiguration
 import com.google.common.collect.Sets
 import org.gradle.api.Plugin
index a1b5768..36895c2 100644 (file)
@@ -16,8 +16,8 @@
 
 package com.android.build.gradle.internal;
 
-import com.android.builder.AndroidDependency;
-import com.android.builder.BundleDependency;
+import com.android.builder.dependency.AndroidDependency;
+import com.android.builder.dependency.BundleDependency;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
index 1707aaa..e891827 100644 (file)
@@ -17,9 +17,9 @@ package com.android.build.gradle.internal.dependency;
 
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
-import com.android.builder.AndroidDependency;
-import com.android.builder.BundleDependency;
-import com.android.builder.ManifestDependency;
+import com.android.builder.dependency.AndroidDependency;
+import com.android.builder.dependency.BundleDependency;
+import com.android.builder.dependency.ManifestDependency;
 
 import java.io.File;
 import java.util.List;
index b4ec45b..1db7729 100644 (file)
@@ -17,9 +17,9 @@
 package com.android.build.gradle.internal.dependency
 import com.android.annotations.NonNull
 import com.android.build.gradle.AndroidSourceSet
-import com.android.builder.AndroidDependency
-import com.android.builder.DependencyContainer
-import com.android.builder.JarDependency
+import com.android.builder.dependency.AndroidDependency
+import com.android.builder.dependency.DependencyContainer
+import com.android.builder.dependency.JarDependency
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 /**
index dd55fea..0d19817 100644 (file)
@@ -16,7 +16,7 @@
 
 package com.android.build.gradle.internal.dependency;
 
-import com.android.builder.ManifestDependency;
+import com.android.builder.dependency.ManifestDependency;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Nested;
 
index d803e82..65334dc 100644 (file)
@@ -16,7 +16,7 @@
 
 package com.android.build.gradle.internal.dependency;
 
-import com.android.builder.SymbolFileProvider;
+import com.android.builder.dependency.SymbolFileProvider;
 import org.gradle.api.tasks.InputFile;
 
 import java.io.File;