Update jetifier 1.0.0-beta08 -> 1.0.0-beta10 (#548)

private/rules/jetifier.bzl

@@ -12,6 +12,7 @@ def _jetify_impl(ctx):
             jetify_args.add("-l", "error")
             jetify_args.add("-o", jetified_outfile)
             jetify_args.add("-i", artifact)
+            jetify_args.add("-timestampsPolicy", "keepPrevious")
             ctx.actions.run(
                 mnemonic = "Jetify",
                 inputs = [artifact],

third_party/jetifier/README.md

@@ -2,4 +2,4 @@
 
 Downloaded from https://developer.android.com/studio/command-line/jetifier.
 
-SHA256: `8ef877e8245f8dcf8f379b2cdc4958ba714147eb8d559d8334a1840e137e5a2c`
+SHA256: `38186db9c9d1b745890b3d35c0667da1cac146ceb3c26aae5bf0802119472c1b`

third_party/jetifier/jetifier-standalone/bin/jetifier-standalone

@@ -80,7 +80,8 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/jetifier-standalone.jar:$APP_HOME/lib/jetifier-processor-1.0.0-beta08.jar:$APP_HOME/lib/commons-cli-1.3.1.jar:$APP_HOME/lib/jetifier-core-1.0.0-beta08.jar:$APP_HOME/lib/asm-util-6.0.jar:$APP_HOME/lib/asm-commons-6.0.jar:$APP_HOME/lib/asm-tree-6.0.jar:$APP_HOME/lib/asm-6.0.jar:$APP_HOME/lib/jdom2-2.0.6.jar:$APP_HOME/lib/kotlin-stdlib-1.3.41.jar:$APP_HOME/lib/gson-2.8.0.jar:$APP_HOME/lib/kotlin-stdlib-common-1.3.41.jar:$APP_HOME/lib/annotations-13.0.jar
+CLASSPATH=$APP_HOME/lib/jetifier-standalone.jar:$APP_HOME/lib/jetifier-processor-1.0.0-beta10.jar:$APP_HOME/lib/commons-cli-1.3.1.jar:$APP_HOME/lib/jetifier-core-1.0.0-beta10.jar:$APP_HOME/lib/asm-util-8.0.1.jar:$APP_HOME/lib/asm-commons-8.0.1.jar:$APP_HOME/lib/asm-analysis-8.0.1.jar:$APP_HOME/lib/asm-tree-8.0.1.jar:$APP_HOME/lib/asm-8.0.1.jar:$APP_HOME/lib/jdom2-2.0.6.jar:$APP_HOME/lib/kotlin-stdlib-1.3.71.jar:$APP_HOME/lib/gson-2.8.0.jar:$APP_HOME/lib/kotlin-stdlib-common-1.3.71.jar:$APP_HOME/lib/annotations-13.0.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $JETIFIER_STANDALONE_OPTS -classpath "\"$CLASSPATH\"" com.android.tools.build.jetifier.standalone.Main "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

third_party/jetifier/jetifier-standalone/bin/jetifier-standalone.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%..
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and JETIFIER_STANDALONE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS=
 
@@ -79,7 +82,8 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\jetifier-standalone.jar;%APP_HOME%\lib\jetifier-processor-1.0.0-beta08.jar;%APP_HOME%\lib\commons-cli-1.3.1.jar;%APP_HOME%\lib\jetifier-core-1.0.0-beta08.jar;%APP_HOME%\lib\asm-util-6.0.jar;%APP_HOME%\lib\asm-commons-6.0.jar;%APP_HOME%\lib\asm-tree-6.0.jar;%APP_HOME%\lib\asm-6.0.jar;%APP_HOME%\lib\jdom2-2.0.6.jar;%APP_HOME%\lib\kotlin-stdlib-1.3.41.jar;%APP_HOME%\lib\gson-2.8.0.jar;%APP_HOME%\lib\kotlin-stdlib-common-1.3.41.jar;%APP_HOME%\lib\annotations-13.0.jar
+set CLASSPATH=%APP_HOME%\lib\jetifier-standalone.jar;%APP_HOME%\lib\jetifier-processor-1.0.0-beta10.jar;%APP_HOME%\lib\commons-cli-1.3.1.jar;%APP_HOME%\lib\jetifier-core-1.0.0-beta10.jar;%APP_HOME%\lib\asm-util-8.0.1.jar;%APP_HOME%\lib\asm-commons-8.0.1.jar;%APP_HOME%\lib\asm-analysis-8.0.1.jar;%APP_HOME%\lib\asm-tree-8.0.1.jar;%APP_HOME%\lib\asm-8.0.1.jar;%APP_HOME%\lib\jdom2-2.0.6.jar;%APP_HOME%\lib\kotlin-stdlib-1.3.71.jar;%APP_HOME%\lib\gson-2.8.0.jar;%APP_HOME%\lib\kotlin-stdlib-common-1.3.71.jar;%APP_HOME%\lib\annotations-13.0.jar
+
 
 @rem Execute jetifier-standalone
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %JETIFIER_STANDALONE_OPTS%  -classpath "%CLASSPATH%" com.android.tools.build.jetifier.standalone.Main %CMD_LINE_ARGS%