diff options
Diffstat (limited to 'gradle/src/main/groovy/com/android/build/gradle/internal')
4 files changed, 16 insertions, 15 deletions
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 index 6ca387c..a4770b6 100644 --- 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 @@ -18,6 +18,7 @@ package com.android.build.gradle.internal.dsl import com.android.annotations.NonNull import com.android.annotations.Nullable import com.android.annotations.VisibleForTesting +import com.android.builder.AndroidBuilder import com.android.builder.BuilderConstants import com.android.builder.DefaultBuildType import com.android.builder.NdkConfig @@ -25,7 +26,6 @@ import com.android.builder.model.SigningConfig import org.gradle.api.Action import org.gradle.api.internal.file.FileResolver import org.gradle.internal.reflect.Instantiator - /** * DSL overlay to make methods that accept String... work. */ @@ -82,12 +82,11 @@ public class BuildTypeDsl extends DefaultBuildType implements Serializable { // -- 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 void buildConfigField( + @NonNull String type, + @NonNull String name, + @NonNull String value) { + addBuildConfigField(AndroidBuilder.createClassField(type, name, value)); } @NonNull diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/ProductFlavorDsl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/ProductFlavorDsl.groovy index 6b78c86..1645a03 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/ProductFlavorDsl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/ProductFlavorDsl.groovy @@ -17,6 +17,7 @@ package com.android.build.gradle.internal.dsl import com.android.annotations.NonNull import com.android.annotations.Nullable +import com.android.builder.AndroidBuilder import com.android.builder.DefaultProductFlavor import com.android.builder.NdkConfig import org.gradle.api.Action @@ -50,12 +51,11 @@ class ProductFlavorDsl extends DefaultProductFlavor { // -- 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 void buildConfigField( + @NonNull String type, + @NonNull String name, + @NonNull String value) { + addBuildConfigField(AndroidBuilder.createClassField(type, name, value)); } @NonNull diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/model/BuildTypeImpl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/model/BuildTypeImpl.java index 03daa6f..ccb1e8b 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/model/BuildTypeImpl.java +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/model/BuildTypeImpl.java @@ -20,6 +20,7 @@ import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.builder.NdkConfig; import com.android.builder.model.BuildType; +import com.android.builder.model.ClassField; import java.io.File; import java.io.Serializable; @@ -112,7 +113,7 @@ class BuildTypeImpl implements BuildType, Serializable { @NonNull @Override - public List<String> getBuildConfig() { + public List<ClassField> getBuildConfigFields() { return Collections.emptyList(); } diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/model/ProductFlavorImpl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/model/ProductFlavorImpl.java index d03ae14..8380ae3 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/model/ProductFlavorImpl.java +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/model/ProductFlavorImpl.java @@ -19,6 +19,7 @@ package com.android.build.gradle.internal.model; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.builder.NdkConfig; +import com.android.builder.model.ClassField; import com.android.builder.model.ProductFlavor; import java.io.File; @@ -142,7 +143,7 @@ class ProductFlavorImpl implements ProductFlavor, Serializable { @NonNull @Override - public List<String> getBuildConfig() { + public List<ClassField> getBuildConfigFields() { return Collections.emptyList(); } |