Prepare for release 1.18.1.

Author: w3roberts

README.md

@@ -46,4 +46,4 @@ https://developer.android.com/studio/command-line/bundletool
 
 ## Releases
 
-Latest release: [1.18.0](https://github.com/google/bundletool/releases)
+Latest release: [1.18.1](https://github.com/google/bundletool/releases)

gradle.properties

@@ -1 +1 @@
-release_version = 1.18.0
+release_version = 1.18.1

src/main/java/com/android/tools/build/bundletool/commands/BuildBundleCommand.java

@@ -43,6 +43,7 @@
 import com.android.tools.build.bundletool.model.utils.files.BufferedIo;
 import com.android.tools.build.bundletool.model.utils.files.FileUtils;
 import com.android.tools.build.bundletool.model.version.BundleToolVersion;
+import com.android.tools.build.bundletool.validation.AppBundleValidator;
 import com.android.tools.build.bundletool.validation.BundleModulesValidator;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
@@ -256,6 +257,9 @@ public void execute() {
           AppBundle.buildFromModules(
               modulesWithTargeting.build(), bundleConfig, getBundleMetadata());
 
+      // Validate the bundle content before writing it to disk.
+      AppBundleValidator.create().validate(appBundle);
+
       Path outputDirectory = getOutputPath().toAbsolutePath().getParent();
       if (Files.notExists(outputDirectory)) {
         logger.info("Output directory '" + outputDirectory + "' does not exist, creating it.");

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.18.0";
+  private static final String CURRENT_VERSION = "1.18.1";
 
 
   /** Returns the version of BundleTool being run. */

src/test/java/com/android/tools/build/bundletool/commands/BuildBundleCommandTest.java

@@ -518,6 +518,34 @@ public void assetsTargeting_generated_deviceTier() throws Exception {
     }
   }
 
+  @Test
+  public void assetsTargeting_invalidDeviceGroupName_throws() throws Exception {
+    XmlNode manifest = androidManifest(PKG_NAME, withHasCode(true));
+    Path module =
+        new ZipBuilder()
+            .addFileWithContent(ZipPath.create("assets/anything.dat"), "any".getBytes(UTF_8))
+            .addFileWithContent(
+                ZipPath.create("assets/texture#tcf_atc/device#group_@$%!/file.dat"),
+                "any2".getBytes(UTF_8))
+            .addFileWithContent(ZipPath.create("dex/classes.dex"), "dex".getBytes(UTF_8))
+            .addFileWithProtoContent(ZipPath.create("manifest/AndroidManifest.xml"), manifest)
+            .writeTo(tmpDir.resolve("base.zip"));
+
+    InvalidBundleException exception =
+        assertThrows(
+            InvalidBundleException.class,
+            () ->
+                BuildBundleCommand.builder()
+                    .setOutputPath(bundlePath)
+                    .setModulesPaths(ImmutableList.of(module))
+                    .build()
+                    .execute());
+
+    assertThat(exception)
+        .hasMessageThat()
+        .contains("Device group names should start with a letter");
+  }
+
   @Test
   public void assetsTargeting_generated_deviceGroup() throws Exception {
     XmlNode manifest = androidManifest(PKG_NAME, withHasCode(true));