Prepare for release 1.7,0.

README.md

@@ -17,6 +17,11 @@ Bundletool has a few different responsibilities:
 
 *   **Extract device spec** from a device as a JSON file.
 
+*   **Add code transparency** to an Android App Bundle. Code transparency is an
+    optional code signing mechanism.
+
+*   **Verify code transparency** inside an Android App Bundle, APK files or an
+    application installed on a connected device.
 
 Read more about the App Bundle format and Bundletool's usage at
 [g.co/androidappbundle](https://g.co/androidappbundle)
@@ -26,4 +31,4 @@ https://developer.android.com/studio/command-line/bundletool
 
 ## Releases
 
-Latest release: [1.6.1](https://github.com/google/bundletool/releases)
+Latest release: [1.7.0](https://github.com/google/bundletool/releases)

build.gradle

@@ -32,13 +32,13 @@ configurations {
 // The repackaging rules are defined in the "shadowJar" task below.
 dependencies {
     compile "com.android.tools:common:30.0.0-alpha10"
-    compile "com.android.tools:r8:2.1.66"
+    compile "com.android.tools:r8:2.2.64"
     compile "com.android.tools.build:apkzlib:4.2.0-alpha13"
     compile "com.android.tools.build:apksig:4.2.0-alpha13"
     compile "com.android.tools.ddms:ddmlib:30.0.0-alpha10"
     compile "com.android:zipflinger:7.0.0-alpha14"
 
-    shadow "com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524"
+    shadow "com.android.tools.build:aapt2-proto:7.0.0-beta04-7396180"
     shadow "com.google.auto.value:auto-value-annotations:1.6.2"
     annotationProcessor "com.google.auto.value:auto-value:1.6.2"
     shadow "com.google.errorprone:error_prone_annotations:2.3.1"
@@ -48,13 +48,18 @@ dependencies {
     shadow "com.google.dagger:dagger:2.28.3"
     annotationProcessor "com.google.dagger:dagger-compiler:2.28.3"
     shadow "javax.inject:javax.inject:1"
-    shadow "org.bitbucket.b_c:jose4j:0.7.0"
+    shadow("org.bitbucket.b_c:jose4j:0.7.0") {
+        exclude group: "org.slf4j", module: "slf4j-api"
+    }
+    shadow "org.slf4j:slf4j-api:1.7.30"
+
+    compileWindows "com.android.tools.build:aapt2:7.0.0-beta04-7396180:windows"
+    compileMacOs "com.android.tools.build:aapt2:7.0.0-beta04-7396180:osx"
+    compileLinux "com.android.tools.build:aapt2:7.0.0-beta04-7396180:linux"
 
-    compileWindows "com.android.tools.build:aapt2:4.1.0-alpha01-6193524:windows"
-    compileMacOs "com.android.tools.build:aapt2:4.1.0-alpha01-6193524:osx"
-    compileLinux "com.android.tools.build:aapt2:4.1.0-alpha01-6193524:linux"
+    runtime "org.slf4j:slf4j-jdk14:1.7.30"
 
-    testCompile "com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524"
+    testCompile "com.android.tools.build:aapt2-proto:7.0.0-beta04-7396180"
     testCompile "com.google.auto.value:auto-value-annotations:1.6.2"
     testAnnotationProcessor "com.google.auto.value:auto-value:1.6.2"
     testCompile "com.google.errorprone:error_prone_annotations:2.3.1"
@@ -76,7 +81,11 @@ dependencies {
     testCompile("org.smali:dexlib2:2.3.4") {
         exclude group: "com.google.guava", module: "guava"
     }
-    testCompile "org.bitbucket.b_c:jose4j:0.7.0"
+    testCompile("org.bitbucket.b_c:jose4j:0.7.0") {
+        exclude group: "org.slf4j", module: "slf4j-api"
+    }
+    testCompile "org.slf4j:slf4j-api:1.7.30"
+    testRuntime "org.slf4j:slf4j-jdk14:1.7.30"
 }
 
 def osName = System.getProperty("os.name").toLowerCase()

gradle.properties

@@ -1 +1 @@
-release_version = 1.6.1
+release_version = 1.7.0

src/main/java/com/android/tools/build/bundletool/BundleToolMain.java

@@ -108,6 +108,14 @@ static void main(String[] args, Runtime runtime) {
         case VersionCommand.COMMAND_NAME:
           VersionCommand.fromFlags(flags, System.out).execute();
           break;
+        case AddTransparencyCommand.COMMAND_NAME:
+          AddTransparencyCommand.fromFlags(flags).execute();
+          break;
+        case CheckTransparencyCommand.COMMAND_NAME:
+          try (AdbServer adbServer = DdmlibAdbServer.getInstance()) {
+            CheckTransparencyCommand.fromFlags(flags, adbServer).execute();
+          }
+          break;
         case HELP_CMD:
           if (flags.getSubCommand().isPresent()) {
             help(flags.getSubCommand().get(), runtime);
@@ -186,6 +194,12 @@ public static void help(String commandName, Runtime runtime) {
       case GetSizeCommand.COMMAND_NAME:
         commandHelp = GetSizeCommand.help();
         break;
+      case AddTransparencyCommand.COMMAND_NAME:
+        commandHelp = AddTransparencyCommand.help();
+        break;
+      case CheckTransparencyCommand.COMMAND_NAME:
+        commandHelp = CheckTransparencyCommand.help();
+        break;
       default:
         System.err.printf("Error: Unrecognized command '%s'.%n%n%n", commandName);
         help();