diff options
Diffstat (limited to 'gradle/src/main/groovy/com/android/build/gradle/internal/dsl')
4 files changed, 14 insertions, 21 deletions
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AaptOptionsImpl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AaptOptionsImpl.groovy index 319cd96..449a43f 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AaptOptionsImpl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/AaptOptionsImpl.groovy @@ -16,8 +16,7 @@ package com.android.build.gradle.internal.dsl; - -import com.android.builder.AaptOptions +import com.android.builder.model.AaptOptions import org.gradle.api.tasks.Input public class AaptOptionsImpl implements AaptOptions { 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 b2c164e..8b9eed0 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 @@ -17,9 +17,9 @@ package com.android.build.gradle.internal.dsl import com.android.annotations.NonNull -import com.android.builder.DefaultBuildType import com.android.builder.BuilderConstants -import com.android.builder.signing.SigningConfig +import com.android.builder.DefaultBuildType +import com.android.builder.model.SigningConfig import com.google.common.collect.Lists /** diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigDsl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigDsl.java index 1455032..2960e18 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigDsl.java +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigDsl.java @@ -18,9 +18,11 @@ package com.android.build.gradle.internal.dsl; import com.android.annotations.NonNull; import com.android.builder.BuilderConstants; -import com.android.builder.signing.SigningConfig; +import com.android.builder.model.SigningConfig; +import com.android.builder.signing.DefaultSigningConfig; import com.android.prefs.AndroidLocation; import com.google.common.base.Objects; +import org.gradle.api.Named; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFile; import org.gradle.api.tasks.Optional; @@ -30,14 +32,11 @@ import java.io.File; import java.io.Serializable; /** - * DSL overlay for {@link SigningConfig}. + * DSL overlay for {@link DefaultSigningConfig}. */ -public class SigningConfigDsl extends SigningConfig implements Serializable { +public class SigningConfigDsl extends DefaultSigningConfig implements Serializable, Named { private static final long serialVersionUID = 1L; - @NonNull - private final String name; - /** * Creates a SigningConfig with a given name. * @@ -45,8 +44,8 @@ public class SigningConfigDsl extends SigningConfig implements Serializable { * */ public SigningConfigDsl(@NonNull String name) { - super(); - this.name = name; + super(name); + if (BuilderConstants.DEBUG.equals(name)) { try { initDebug(); @@ -56,11 +55,6 @@ public class SigningConfigDsl extends SigningConfig implements Serializable { } } - @NonNull - public String getName() { - return name; - } - public SigningConfigDsl initWith(SigningConfig that) { setStoreFile(that.getStoreFile()); setStorePassword(that.getStorePassword()); @@ -122,7 +116,7 @@ public class SigningConfigDsl extends SigningConfig implements Serializable { SigningConfigDsl that = (SigningConfigDsl) o; - if (!name.equals(that.name)) return false; + if (!mName.equals(that.mName)) return false; return true; } @@ -130,14 +124,14 @@ public class SigningConfigDsl extends SigningConfig implements Serializable { @Override public int hashCode() { int result = super.hashCode(); - result = 31 * result + name.hashCode(); + result = 31 * result + mName.hashCode(); return result; } @Override public String toString() { return Objects.toStringHelper(this) - .add("name", name) + .add("name", mName) .add("storeFile", getStoreFile() != null ? getStoreFile().getAbsolutePath() : "null") .add("storePassword", getStorePassword()) .add("keyAlias", getKeyAlias()) diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigFactory.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigFactory.groovy index 57af98e..cdb3ebf 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigFactory.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/SigningConfigFactory.groovy @@ -16,7 +16,7 @@ package com.android.build.gradle.internal.dsl -import com.android.builder.signing.SigningConfig +import com.android.builder.model.SigningConfig import org.gradle.api.NamedDomainObjectFactory import org.gradle.internal.reflect.Instantiator |