Upgrading dagger version to 2.30

Bug: 1139446
Change-Id: I3613007c5480aa59d4931b82dbaf352a30576179
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2553856
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830679}

DEPS

@@ -3255,7 +3255,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger',
-              'version': 'version:2.26-cr0',
+              'version': 'version:2.30-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3266,7 +3266,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler',
-              'version': 'version:2.26-cr0',
+              'version': 'version:2.30-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3277,7 +3277,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers',
-              'version': 'version:2.26-cr0',
+              'version': 'version:2.30-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3288,7 +3288,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
-              'version': 'version:2.26-cr0',
+              'version': 'version:2.30-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3475,7 +3475,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet',
-              'version': 'version:1.11.1-cr0',
+              'version': 'version:1.13.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3871,7 +3871,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib',
-              'version': 'version:1.3.50-cr0',
+              'version': 'version:1.3.72-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3882,7 +3882,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common',
-              'version': 'version:1.3.50-cr0',
+              'version': 'version:1.3.72-cr0',
           },
       ],
       'condition': 'checkout_android',

third_party/android_deps/BUILD.gn

@@ -1454,7 +1454,7 @@ java_prebuilt("com_google_code_gson_gson_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_dagger_dagger_java") {
-  jar_path = "libs/com_google_dagger_dagger/dagger-2.26.jar"
+  jar_path = "libs/com_google_dagger_dagger/dagger-2.30.jar"
   output_name = "com_google_dagger_dagger"
   supports_android = true
   deps = [ ":javax_inject_javax_inject_java" ]
@@ -1462,7 +1462,7 @@ java_prebuilt("com_google_dagger_dagger_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_dagger_dagger_compiler_java") {
-  jar_path = "libs/com_google_dagger_dagger_compiler/dagger-compiler-2.26.jar"
+  jar_path = "libs/com_google_dagger_dagger_compiler/dagger-compiler-2.30.jar"
   output_name = "com_google_dagger_dagger_compiler"
   enable_bytecode_checks = false
   deps = [
@@ -1667,7 +1667,7 @@ java_prebuilt("com_googlecode_java_diff_utils_diffutils_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_squareup_javapoet_java") {
-  jar_path = "libs/com_squareup_javapoet/javapoet-1.11.1.jar"
+  jar_path = "libs/com_squareup_javapoet/javapoet-1.13.0.jar"
   output_name = "com_squareup_javapoet"
   enable_bytecode_checks = false
 }
@@ -2483,7 +2483,7 @@ java_prebuilt("com_google_code_findbugs_jFormatString_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_dagger_dagger_producers_java") {
-  jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.26.jar"
+  jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.30.jar"
   output_name = "com_google_dagger_dagger_producers"
   enable_bytecode_checks = false
 
@@ -2501,7 +2501,7 @@ java_prebuilt("com_google_dagger_dagger_producers_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_dagger_dagger_spi_java") {
-  jar_path = "libs/com_google_dagger_dagger_spi/dagger-spi-2.26.jar"
+  jar_path = "libs/com_google_dagger_dagger_spi/dagger-spi-2.30.jar"
   output_name = "com_google_dagger_dagger_spi"
   enable_bytecode_checks = false
 
@@ -2976,7 +2976,7 @@ java_prebuilt("org_jetbrains_annotations_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_java") {
-  jar_path = "libs/org_jetbrains_kotlin_kotlin_stdlib/kotlin-stdlib-1.3.50.jar"
+  jar_path = "libs/org_jetbrains_kotlin_kotlin_stdlib/kotlin-stdlib-1.3.72.jar"
   output_name = "org_jetbrains_kotlin_kotlin_stdlib"
   enable_bytecode_checks = false
 
@@ -2991,7 +2991,7 @@ java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_common_java") {
-  jar_path = "libs/org_jetbrains_kotlin_kotlin_stdlib_common/kotlin-stdlib-common-1.3.50.jar"
+  jar_path = "libs/org_jetbrains_kotlin_kotlin_stdlib_common/kotlin-stdlib-common-1.3.72.jar"
   output_name = "org_jetbrains_kotlin_kotlin_stdlib_common"
   enable_bytecode_checks = false
 

third_party/android_deps/build.gradle

@@ -179,12 +179,12 @@ dependencies {
     // buildCompile targets have supports_android = false.
     buildCompile "com.google.guava:guava:27.0.1-jre"
 
-    def daggerVersion = '2.26'
+    def daggerVersion = '2.30'
     compile "com.google.dagger:dagger:${daggerVersion}"
     buildCompile "com.google.dagger:dagger-compiler:${daggerVersion}"
 
     // Matches version depended on by Dagger.
-    buildCompile "com.squareup:javapoet:1.11.0"
+    buildCompile "com.squareup:javapoet:1.13.0"
 
     def errorproneVersion = '2.4.0'
     // Used by downstream targets.

third_party/android_deps/libs/com_google_dagger_dagger/README.chromium

 Name: Dagger
 Short Name: dagger
 URL: https://github.com/google/dagger
-Version: 2.26
+Version: 2.30
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/com_google_dagger_dagger/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.26-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.30-cr0
 package: chromium/third_party/android_deps/libs/com_google_dagger_dagger
 description: "Dagger"
 data:
-- file: dagger-2.26.jar
+- file: dagger-2.30.jar

third_party/android_deps/libs/com_google_dagger_dagger_compiler/README.chromium

 Name: Dagger Compiler
 Short Name: dagger-compiler
 URL: https://github.com/google/dagger
-Version: 2.26
+Version: 2.30
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_dagger_dagger_compiler/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.26-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.30-cr0
 package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler
 description: "Dagger Compiler"
 data:
-- file: dagger-compiler-2.26.jar
+- file: dagger-compiler-2.30.jar

third_party/android_deps/libs/com_google_dagger_dagger_producers/README.chromium

 Name: Dagger Producers
 Short Name: dagger-producers
 URL: https://github.com/google/dagger
-Version: 2.26
+Version: 2.30
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_dagger_dagger_producers/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.26-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.30-cr0
 package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers
 description: "Dagger Producers"
 data:
-- file: dagger-producers-2.26.jar
+- file: dagger-producers-2.30.jar

third_party/android_deps/libs/com_google_dagger_dagger_spi/README.chromium

 Name: Dagger SPI
 Short Name: dagger-spi
 URL: https://github.com/google/dagger
-Version: 2.26
+Version: 2.30
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_dagger_dagger_spi/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.26-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.30-cr0
 package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi
 description: "Dagger SPI"
 data:
-- file: dagger-spi-2.26.jar
+- file: dagger-spi-2.30.jar

third_party/android_deps/libs/com_squareup_javapoet/README.chromium

 Name: JavaPoet
 Short Name: javapoet
 URL: http://github.com/square/javapoet/
-Version: 1.11.1
+Version: 1.13.0
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_squareup_javapoet/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.11.1-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.13.0-cr0
 package: chromium/third_party/android_deps/libs/com_squareup_javapoet
 description: "JavaPoet"
 data:
-- file: javapoet-1.11.1.jar
+- file: javapoet-1.13.0.jar

third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib/README.chromium

 Name: org.jetbrains.kotlin:kotlin-stdlib
 Short Name: kotlin-stdlib
 URL: https://kotlinlang.org/
-Version: 1.3.50
+Version: 1.3.72
 License: The Apache License, Version 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.3.50-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.3.72-cr0
 package: chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib
 description: "org.jetbrains.kotlin:kotlin-stdlib"
 data:
-- file: kotlin-stdlib-1.3.50.jar
+- file: kotlin-stdlib-1.3.72.jar

third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common/README.chromium

 Name: org.jetbrains.kotlin:kotlin-stdlib-common
 Short Name: kotlin-stdlib-common
 URL: https://kotlinlang.org/
-Version: 1.3.50
+Version: 1.3.72
 License: The Apache License, Version 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.3.50-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.3.72-cr0
 package: chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common
 description: "org.jetbrains.kotlin:kotlin-stdlib-common"
 data:
-- file: kotlin-stdlib-common-1.3.50.jar
+- file: kotlin-stdlib-common-1.3.72.jar

third_party/jetifier_standalone/bin/jetifier-standalone

@@ -84,7 +84,16 @@ esac
 if [ -z "$ANDROID_DEPS" ]; then
   ANDROID_DEPS=$THIRD_PARTY_DIR/android_deps/libs
 fi
-CLASSPATH=$APP_HOME/lib/jetifier-standalone.jar:$ANDROID_DEPS/com_android_tools_build_jetifier_jetifier_processor/jetifier-processor-1.0.0-beta08.jar:$ANDROID_DEPS/commons_cli_commons_cli/commons-cli-1.3.1.jar:$ANDROID_DEPS/com_android_tools_build_jetifier_jetifier_core/jetifier-core-1.0.0-beta08.jar:$ANDROID_DEPS/org_ow2_asm_asm_util/asm-util-7.0.jar:$ANDROID_DEPS/org_ow2_asm_asm_commons/asm-commons-7.0.jar:$ANDROID_DEPS/org_ow2_asm_asm_tree/asm-tree-7.0.jar:$ANDROID_DEPS/org_ow2_asm_asm/asm-7.0.jar:$ANDROID_DEPS/org_jdom_jdom2/jdom2-2.0.6.jar:$ANDROID_DEPS/org_jetbrains_kotlin_kotlin_stdlib/kotlin-stdlib-1.3.50.jar:$ANDROID_DEPS/com_google_code_gson_gson/gson-2.8.0.jar:$ANDROID_DEPS/org_jetbrains_kotlin_kotlin_stdlib_common/kotlin-stdlib-common-1.3.50.jar:$ANDROID_DEPS/org_jetbrains_annotations/annotations-13.0.jar
+CLASSPATH=$APP_HOME/lib/jetifier-standalone.jar:$ANDROID_DEPS/com_android_tools_build_jetifier_jetifier_processor/jetifier-processor-1.0.0-beta08.jar:$ANDROID_DEPS/commons_cli_commons_cli/commons-cli-1.3.1.jar:$ANDROID_DEPS/com_android_tools_build_jetifier_jetifier_core/jetifier-core-1.0.0-beta08.jar:$ANDROID_DEPS/org_ow2_asm_asm_util/asm-util-7.0.jar:$ANDROID_DEPS/org_ow2_asm_asm_commons/asm-commons-7.0.jar:$ANDROID_DEPS/org_ow2_asm_asm_tree/asm-tree-7.0.jar:$ANDROID_DEPS/org_ow2_asm_asm/asm-7.0.jar:$ANDROID_DEPS/org_jdom_jdom2/jdom2-2.0.6.jar:$ANDROID_DEPS/org_jetbrains_kotlin_kotlin_stdlib/kotlin-stdlib-1.3.72.jar:$ANDROID_DEPS/com_google_code_gson_gson/gson-2.8.0.jar:$ANDROID_DEPS/org_jetbrains_kotlin_kotlin_stdlib_common/kotlin-stdlib-common-1.3.72.jar:$ANDROID_DEPS/org_jetbrains_annotations/annotations-13.0.jar
+
+# Ensuring that each file in the CLASSPATH exists.
+for path in ${CLASSPATH//:/ }; do
+    if [ ! -f $path ]; then
+      die "File in CLASSPATH does not exist: $path
+
+Version numbers likely need to be updated in the jetifier-standalone script."
+    fi
+done
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then