From 0b9149c283e2df73850da670f2130a732639283d Mon Sep 17 00:00:00 2001 From: Dan Palmer Date: Wed, 9 Aug 2023 10:10:25 +0000 Subject: [PATCH] Prepare for release 1.15.4. --- README.md | 2 +- gradle.properties | 2 +- .../bundletool/model/ManifestEditor.java | 6 ------ .../model/version/BundleToolVersion.java | 2 +- .../bundletool/model/ManifestEditorTest.java | 19 ------------------- 5 files changed, 3 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 8f304e72..32067aca 100644 --- a/README.md +++ b/README.md @@ -46,4 +46,4 @@ https://developer.android.com/studio/command-line/bundletool ## Releases -Latest release: [1.15.3](https://github.com/google/bundletool/releases) +Latest release: [1.15.4](https://github.com/google/bundletool/releases) diff --git a/gradle.properties b/gradle.properties index cc134cf9..066fd510 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -release_version = 1.15.3 +release_version = 1.15.4 diff --git a/src/main/java/com/android/tools/build/bundletool/model/ManifestEditor.java b/src/main/java/com/android/tools/build/bundletool/model/ManifestEditor.java index 121a6e46..161a1624 100644 --- a/src/main/java/com/android/tools/build/bundletool/model/ManifestEditor.java +++ b/src/main/java/com/android/tools/build/bundletool/model/ManifestEditor.java @@ -306,12 +306,6 @@ public ManifestEditor setSplitsRequired(boolean value) { setMetadataValue( META_DATA_KEY_SPLITS_REQUIRED, createAndroidAttribute("value", VALUE_RESOURCE_ID).setValueAsBoolean(value)); - - manifestElement - .getOrCreateAndroidAttribute( - IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID) - .setValueAsBoolean(value); - return setApplcationAttributeBoolean( IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID, value); } diff --git a/src/main/java/com/android/tools/build/bundletool/model/version/BundleToolVersion.java b/src/main/java/com/android/tools/build/bundletool/model/version/BundleToolVersion.java index fa6ad664..cdb4860b 100644 --- a/src/main/java/com/android/tools/build/bundletool/model/version/BundleToolVersion.java +++ b/src/main/java/com/android/tools/build/bundletool/model/version/BundleToolVersion.java @@ -26,7 +26,7 @@ */ public final class BundleToolVersion { - private static final String CURRENT_VERSION = "1.15.3"; + private static final String CURRENT_VERSION = "1.15.4"; /** Returns the version of BundleTool being run. */ diff --git a/src/test/java/com/android/tools/build/bundletool/model/ManifestEditorTest.java b/src/test/java/com/android/tools/build/bundletool/model/ManifestEditorTest.java index 3424d236..1fea5829 100644 --- a/src/test/java/com/android/tools/build/bundletool/model/ManifestEditorTest.java +++ b/src/test/java/com/android/tools/build/bundletool/model/ManifestEditorTest.java @@ -83,7 +83,6 @@ import com.android.tools.build.bundletool.model.manifestelements.Provider; import com.android.tools.build.bundletool.model.manifestelements.Receiver; import com.android.tools.build.bundletool.model.utils.xmlproto.XmlProtoAttribute; -import com.android.tools.build.bundletool.model.utils.xmlproto.XmlProtoAttributeBuilder; import com.android.tools.build.bundletool.model.utils.xmlproto.XmlProtoElement; import com.android.tools.build.bundletool.model.utils.xmlproto.XmlProtoElementBuilder; import com.google.common.collect.ImmutableList; @@ -474,12 +473,6 @@ public void setSplitsRequired() throws Exception { IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID, true)); - assertThat(editedManifest.getManifestElement().getAttributes()) - .containsExactly( - XmlProtoAttributeBuilder.createAndroidAttribute( - IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID) - .setValueAsBoolean(true) - .build()); } @Test @@ -504,12 +497,6 @@ public void setSplitsRequired_idempotent() throws Exception { IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID, true)); - assertThat(editedManifest.getManifestElement().getAttributes()) - .containsExactly( - XmlProtoAttributeBuilder.createAndroidAttribute( - IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID) - .setValueAsBoolean(true) - .build()); } @Test @@ -534,12 +521,6 @@ public void setSplitsRequired_lastInvocationWins() throws Exception { IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID, false)); - assertThat(editedManifest.getManifestElement().getAttributes()) - .containsExactly( - XmlProtoAttributeBuilder.createAndroidAttribute( - IS_SPLIT_REQUIRED_ATTRIBUTE_NAME, IS_SPLIT_REQUIRED_RESOURCE_ID) - .setValueAsBoolean(false) - .build()); } @Test