diff options
32 files changed, 62 insertions, 51 deletions
diff --git a/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy b/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy index 587f408..62f1ba0 100644 --- a/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy +++ b/gradle/src/build-test/groovy/com/android/build/gradle/BuildTest.groovy @@ -15,11 +15,13 @@ */ package com.android.build.gradle -import com.android.build.gradle.internal.BaseTest + +import com.android.build.gradle.internal.test.BaseTest import com.google.common.collect.Sets import javax.imageio.ImageIO import java.awt.image.BufferedImage + /** * Build tests. * diff --git a/gradle/src/device-test/groovy/com/android/build/gradle/DeviceTest.groovy b/gradle/src/device-test/groovy/com/android/build/gradle/DeviceTest.groovy index 72edd89..06f44d0 100644 --- a/gradle/src/device-test/groovy/com/android/build/gradle/DeviceTest.groovy +++ b/gradle/src/device-test/groovy/com/android/build/gradle/DeviceTest.groovy @@ -15,7 +15,9 @@ */ package com.android.build.gradle -import com.android.build.gradle.internal.BaseTest + +import com.android.build.gradle.internal.test.BaseTest + /** * Device tests. * diff --git a/gradle/src/main/groovy/com/android/build/gradle/AppExtension.groovy b/gradle/src/main/groovy/com/android/build/gradle/AppExtension.groovy index ad6fa0a..ecd81bb 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/AppExtension.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/AppExtension.groovy @@ -16,8 +16,8 @@ package com.android.build.gradle import com.android.builder.BuildType -import com.android.builder.ProductFlavor import com.android.builder.Keystore +import com.android.builder.ProductFlavor import org.gradle.api.Action import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.internal.project.ProjectInternal diff --git a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy index 4f3ba11..5b26a46 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy @@ -16,17 +16,16 @@ package com.android.build.gradle import com.android.build.gradle.internal.BuildTypeData -import com.android.build.gradle.internal.BuildTypeFactory -import com.android.build.gradle.internal.ConfigurationDependencies import com.android.build.gradle.internal.DefaultBuildVariant -import com.android.build.gradle.internal.GroupableProductFlavor -import com.android.build.gradle.internal.GroupableProductFlavorFactory -import com.android.build.gradle.internal.PluginHolder import com.android.build.gradle.internal.ProductFlavorData import com.android.build.gradle.internal.ProductionAppVariant - -import com.android.build.gradle.internal.KeystoreFactory import com.android.build.gradle.internal.TestAppVariant +import com.android.build.gradle.internal.dependency.ConfigurationDependencies +import com.android.build.gradle.internal.dsl.BuildTypeFactory +import com.android.build.gradle.internal.dsl.GroupableProductFlavor +import com.android.build.gradle.internal.dsl.GroupableProductFlavorFactory +import com.android.build.gradle.internal.dsl.KeystoreFactory +import com.android.build.gradle.internal.test.PluginHolder import com.android.builder.AndroidDependency import com.android.builder.BuildType import com.android.builder.JarDependency 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 a26da87..349c69c 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy @@ -15,11 +15,11 @@ */ package com.android.build.gradle -import com.android.build.gradle.internal.AaptOptionsImpl -import com.android.build.gradle.internal.AndroidSourceSetFactory -import com.android.build.gradle.internal.DexOptionsImpl -import com.android.build.gradle.internal.GroupableProductFlavor -import com.android.build.gradle.internal.ProductFlavorDsl +import com.android.build.gradle.internal.dsl.AaptOptionsImpl +import com.android.build.gradle.internal.dsl.AndroidSourceSetFactory +import com.android.build.gradle.internal.dsl.DexOptionsImpl +import com.android.build.gradle.internal.dsl.GroupableProductFlavor +import com.android.build.gradle.internal.dsl.ProductFlavorDsl import com.android.builder.ProductFlavor import org.gradle.api.Action import org.gradle.api.NamedDomainObjectContainer 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 b53a815..3531aff 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy @@ -14,17 +14,18 @@ * limitations under the License. */ package com.android.build.gradle + import com.android.SdkConstants -import com.android.build.gradle.internal.AndroidDependencyImpl import com.android.build.gradle.internal.ApplicationVariant -import com.android.build.gradle.internal.ConfigurationDependencies -import com.android.build.gradle.internal.DependencyChecker import com.android.build.gradle.internal.LoggerWrapper -import com.android.build.gradle.internal.ManifestDependencyImpl import com.android.build.gradle.internal.ProductFlavorData import com.android.build.gradle.internal.ProductionAppVariant -import com.android.build.gradle.internal.SymbolFileProviderImpl import com.android.build.gradle.internal.TestAppVariant +import com.android.build.gradle.internal.dependency.AndroidDependencyImpl +import com.android.build.gradle.internal.dependency.ConfigurationDependencies +import com.android.build.gradle.internal.dependency.DependencyChecker +import com.android.build.gradle.internal.dependency.ManifestDependencyImpl +import com.android.build.gradle.internal.dependency.SymbolFileProviderImpl import com.android.build.gradle.internal.tasks.AidlCompileTask import com.android.build.gradle.internal.tasks.AndroidDependencyTask import com.android.build.gradle.internal.tasks.DexTask @@ -76,6 +77,7 @@ import org.gradle.api.tasks.compile.JavaCompile import org.gradle.internal.reflect.Instantiator import org.gradle.tooling.BuildException import org.gradle.util.GUtil + /** * Base class for all Android plugins */ diff --git a/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy b/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy index 7357360..046a8de 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy @@ -27,8 +27,8 @@ import com.android.build.gradle.tasks.ProcessManifest import com.android.build.gradle.tasks.ProcessResources import com.android.build.gradle.tasks.ZipAlign import com.android.builder.BuildType -import com.android.builder.ProductFlavor import com.android.builder.Keystore +import com.android.builder.ProductFlavor import org.gradle.api.Task import org.gradle.api.tasks.Copy import org.gradle.api.tasks.bundling.Zip diff --git a/gradle/src/main/groovy/com/android/build/gradle/LibraryExtension.groovy b/gradle/src/main/groovy/com/android/build/gradle/LibraryExtension.groovy index 9027897..1f471f8 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/LibraryExtension.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/LibraryExtension.groovy @@ -15,7 +15,7 @@ */ package com.android.build.gradle -import com.android.build.gradle.internal.BuildTypeFactory.BuildTypeDsl +import com.android.build.gradle.internal.dsl.BuildTypeFactory.BuildTypeDsl import com.android.builder.BuildType import org.gradle.api.Action import org.gradle.api.internal.project.ProjectInternal 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 e1e0448..6612bcd 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy @@ -16,11 +16,11 @@ package com.android.build.gradle import com.android.build.gradle.internal.BuildTypeData -import com.android.build.gradle.internal.ConfigurationDependencies import com.android.build.gradle.internal.DefaultBuildVariant 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.BuildType import com.android.builder.BuilderConstants diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/BuildTypeData.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/BuildTypeData.groovy index 94a5bee..1e13497 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/BuildTypeData.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/BuildTypeData.groovy @@ -16,6 +16,7 @@ package com.android.build.gradle.internal import com.android.build.gradle.AndroidSourceSet +import com.android.build.gradle.internal.dependency.ConfigurationDependencies import com.android.builder.BuildType import org.gradle.api.Project import org.gradle.api.Task diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy index 860e701..c1e46ab 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy @@ -25,8 +25,8 @@ import com.android.build.gradle.tasks.ProcessManifest import com.android.build.gradle.tasks.ProcessResources import com.android.build.gradle.tasks.ZipAlign import com.android.builder.BuildType -import com.android.builder.ProductFlavor import com.android.builder.Keystore +import com.android.builder.ProductFlavor import org.gradle.api.Task import org.gradle.api.tasks.Copy import org.gradle.api.tasks.bundling.Zip diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/ProductFlavorData.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/ProductFlavorData.groovy index 5c4f324..a6fb265 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/ProductFlavorData.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/ProductFlavorData.groovy @@ -17,6 +17,7 @@ package com.android.build.gradle.internal import com.android.build.gradle.AndroidSourceSet +import com.android.build.gradle.internal.dependency.ConfigurationDependencies import com.android.builder.ProductFlavor import org.gradle.api.Project import org.gradle.api.Task @@ -24,7 +25,7 @@ import org.gradle.api.Task /** * Class containing a ProductFlavor and associated data (sourcesets) */ -class ProductFlavorData<T extends ProductFlavor> extends ConfigurationDependencies { +public class ProductFlavorData<T extends ProductFlavor> extends ConfigurationDependencies { final T productFlavor diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidDependencyImpl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/AndroidDependencyImpl.groovy index e803fa5..72853ee 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidDependencyImpl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/AndroidDependencyImpl.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dependency import com.android.builder.AndroidDependency import com.android.builder.BundleDependency diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/ConfigurationDependencies.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ConfigurationDependencies.groovy index 890001a..a982f20 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/ConfigurationDependencies.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ConfigurationDependencies.groovy @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dependency +import com.android.annotations.NonNull import com.android.build.gradle.AndroidSourceSet import com.android.builder.JarDependency import org.gradle.api.Project @@ -25,9 +26,9 @@ import org.gradle.api.artifacts.Configuration * Object that represents the dependencies of a configuration, and optionally contains the * dependencies for a test config for the given config. */ -class ConfigurationDependencies { +public class ConfigurationDependencies { - protected static enum ConfigType { DEFAULT, FLAVOR, BUILDTYPE } + public static enum ConfigType { DEFAULT, FLAVOR, BUILDTYPE } final Project project final AndroidSourceSet sourceSet @@ -36,7 +37,9 @@ class ConfigurationDependencies { DependencyChecker checker - ConfigurationDependencies(Project project, AndroidSourceSet sourceSet, ConfigType type) { + protected ConfigurationDependencies(@NonNull Project project, + @NonNull AndroidSourceSet sourceSet, + @NonNull ConfigType type) { this.project = project this.sourceSet = sourceSet this.type = type @@ -45,11 +48,11 @@ class ConfigurationDependencies { List<AndroidDependencyImpl> libraries List<JarDependency> jars - Configuration getConfiguration() { + public Configuration getConfiguration() { return project.configurations[sourceSet.compileConfigurationName] } - String getConfigBaseName() { + public String getConfigBaseName() { return sourceSet.name } } diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DependencyChecker.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/DependencyChecker.groovy index 4ea664e..525ed4f 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/DependencyChecker.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/DependencyChecker.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dependency import com.android.utils.ILogger import org.gradle.api.artifacts.ModuleVersionIdentifier diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/ManifestDependencyImpl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ManifestDependencyImpl.java index 49ff01d..f4969c0 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/ManifestDependencyImpl.java +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/ManifestDependencyImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal; +package com.android.build.gradle.internal.dependency; import com.android.builder.ManifestDependency; import org.gradle.api.tasks.InputFile; diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/SymbolFileProviderImpl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/SymbolFileProviderImpl.java index 002f9c0..3348699 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/SymbolFileProviderImpl.java +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dependency/SymbolFileProviderImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal; +package com.android.build.gradle.internal.dependency; import com.android.builder.SymbolFileProvider; import org.gradle.api.tasks.InputFile; diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/AaptOptionsImpl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AaptOptionsImpl.groovy index 1b65438..319cd96 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/AaptOptionsImpl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AaptOptionsImpl.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal; +package com.android.build.gradle.internal.dsl; import com.android.builder.AaptOptions diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidSourceSetFactory.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AndroidSourceSetFactory.groovy index 43e5797..3612e4f 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidSourceSetFactory.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AndroidSourceSetFactory.groovy @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import com.android.build.gradle.AndroidSourceSet +import com.android.build.gradle.internal.DefaultAndroidSourceSet import org.gradle.api.NamedDomainObjectFactory import org.gradle.api.internal.file.FileResolver import org.gradle.internal.reflect.Instantiator diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/BuildTypeFactory.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeFactory.groovy index 29fa81b..fd22da1 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/BuildTypeFactory.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeFactory.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import com.android.builder.BuildType import org.gradle.api.NamedDomainObjectFactory diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DexOptionsImpl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/DexOptionsImpl.groovy index b6de346..755bf9b 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/DexOptionsImpl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/DexOptionsImpl.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import com.android.builder.DexOptions import org.gradle.api.tasks.Input; diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/GroupableProductFlavor.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/GroupableProductFlavor.groovy index ff9db08..7551151 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/GroupableProductFlavor.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/GroupableProductFlavor.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import com.android.builder.ProductFlavor diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/GroupableProductFlavorFactory.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/GroupableProductFlavorFactory.groovy index 0faf0f0..3368f98 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/GroupableProductFlavorFactory.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/GroupableProductFlavorFactory.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import org.gradle.api.NamedDomainObjectFactory import org.gradle.internal.reflect.Instantiator diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/KeystoreFactory.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/KeystoreFactory.groovy index fe51781..a568e86 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/KeystoreFactory.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/KeystoreFactory.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import com.android.builder.Keystore import org.gradle.api.NamedDomainObjectFactory diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/ProductFlavorDsl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/ProductFlavorDsl.groovy index 9f3729c..8ae6c57 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/ProductFlavorDsl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/ProductFlavorDsl.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.dsl import com.android.builder.ProductFlavor diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/PrepareDependenciesTask.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/PrepareDependenciesTask.groovy index 811347f..943d043 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/PrepareDependenciesTask.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/PrepareDependenciesTask.groovy @@ -15,7 +15,7 @@ */ package com.android.build.gradle.internal.tasks -import com.android.build.gradle.internal.DependencyChecker +import com.android.build.gradle.internal.dependency.DependencyChecker import com.android.utils.Pair import org.gradle.api.tasks.TaskAction diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/ProcessResourcesTask.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/ProcessResourcesTask.groovy index be7232c..9c971a4 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/ProcessResourcesTask.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/tasks/ProcessResourcesTask.groovy @@ -15,7 +15,7 @@ */ package com.android.build.gradle.internal.tasks -import com.android.build.gradle.internal.AaptOptionsImpl +import com.android.build.gradle.internal.dsl.AaptOptionsImpl import com.android.build.gradle.tasks.ProcessResources import com.android.builder.SymbolFileProvider import com.android.builder.VariantConfiguration diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/PluginHolder.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/test/PluginHolder.groovy index 89741de..0ccd3e1 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/PluginHolder.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/test/PluginHolder.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.test import com.android.build.gradle.AppPlugin diff --git a/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy index a0519f8..c48ffdb 100644 --- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy +++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy @@ -15,7 +15,7 @@ */ package com.android.build.gradle -import com.android.build.gradle.internal.BaseTest +import com.android.build.gradle.internal.test.BaseTest import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder diff --git a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy index c3b7588..ffa0c3e 100644 --- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy +++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy @@ -16,8 +16,8 @@ package com.android.build.gradle import com.android.build.gradle.internal.ApplicationVariant -import com.android.build.gradle.internal.BaseTest -import com.android.build.gradle.internal.PluginHolder +import com.android.build.gradle.internal.test.BaseTest +import com.android.build.gradle.internal.test.PluginHolder import com.android.builder.BuildType import com.android.builder.Keystore import com.android.builder.internal.signing.DebugKeyHelper diff --git a/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy index dcedc6f..cdc184d 100644 --- a/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy +++ b/gradle/src/test/groovy/com/android/build/gradle/LibraryPluginDslTest.groovy @@ -15,7 +15,7 @@ */ package com.android.build.gradle -import com.android.build.gradle.internal.BaseTest +import com.android.build.gradle.internal.test.BaseTest import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder diff --git a/gradle/src/test/groovy/com/android/build/gradle/internal/BaseTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/internal/test/BaseTest.groovy index febd5e3..69a2271 100755 --- a/gradle/src/test/groovy/com/android/build/gradle/internal/BaseTest.groovy +++ b/gradle/src/test/groovy/com/android/build/gradle/internal/test/BaseTest.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.build.gradle.internal +package com.android.build.gradle.internal.test import com.android.build.gradle.BasePlugin import com.android.sdklib.internal.project.ProjectProperties |