Move BuildTypeDsl out of BuildTypeFactory to workaround some groovy bug.

As an inner class it prevented access to its parent in a closure.

See http://jira.codehaus.org/browse/GROOVY-5875

Change-Id: I29e5563173f8c5fec795cbd145ae02c941b0f47b

5 files changed, 43 insertions, 25 deletions

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 1f471f8..ca3d2d4 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.dsl.BuildTypeFactory.BuildTypeDsl
+import com.android.build.gradle.internal.dsl.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/internal/dsl/BuildTypeDsl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
new file mode 100644
index 0000000..7d0811e
--- /dev/null
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.build.gradle.internal.dsl
+
+import com.android.builder.BuildType
+
+/**
+ * DSL overlay to make methods that accept String... work.
+ */
+public class BuildTypeDsl extends BuildType {
+    private static final long serialVersionUID = 1L
+
+    BuildTypeDsl(String name) {
+        super(name)
+    }
+
+    // -- DSL Methods. TODO remove once the instantiator does what I expect it to do.
+
+    public void buildConfig(String... lines) {
+        setBuildConfig(lines)
+    }
+
+    public void buildConfig(String line) {
+        setBuildConfig(line)
+    }
+}
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeFactory.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeFactory.groovy
index fd22da1..3732864 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeFactory.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeFactory.groovy
@@ -27,28 +27,6 @@ class BuildTypeFactory implements NamedDomainObjectFactory<BuildType> {
 
     final Instantiator instantiator
 
-    /**
-     * DSL overlay to make methods that accept String... work.
-     */
-    static class BuildTypeDsl extends BuildType {
-        private static final long serialVersionUID = 1L
-
-        BuildTypeDsl(String name) {
-            super(name)
-        }
-
-        // -- DSL Methods. TODO remove once the instantiator does what I expect it to do.
-
-        public void buildConfig(String... lines) {
-            setBuildConfig(lines)
-        }
-
-        public void buildConfig(String line) {
-            setBuildConfig(line)
-        }
-    }
-
-
     public BuildTypeFactory(Instantiator instantiator) {
         this.instantiator = instantiator
     }
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 c48ffdb..c9fe6b3 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginDslTest.groovy
@@ -82,7 +82,7 @@ public class AppPluginDslTest extends BaseTest {
 
             buildTypes {
                 staging {
-                    keystore owner.keystores.debug
+                    keystore keystores.debug
                 }
             }
         }
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 ffa0c3e..a33a322 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/AppPluginInternalTest.groovy
@@ -121,7 +121,7 @@ public class AppPluginInternalTest extends BaseTest {
 
             buildTypes {
                 staging {
-                    keystore owner.keystores.debug
+                    keystore keystores.debug
                 }
             }
         }