Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ example](https://github.com/bazelbuild/examples/tree/master/android/firebase-clo

To integrate Crashlytics into your Android app, follow the [instructions in the
README](tools/crashlytics/README.md) in the `crashlytics` directory.

## Jetifier

For an example of using
[Jetifier](https://developer.android.com/studio/command-line/jetifier) on legacy
libraries to use AndroidX libraries, [see this example](tools/jetifier/).
26 changes: 26 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

RULES_JVM_EXTERNAL_TAG = "2.2"
RULES_JVM_EXTERNAL_SHA = "f1203ce04e232ab6fdd81897cf0ff76f2c04c0741424d192f28e65ae752ce2d6"

http_archive(
name = "rules_jvm_external",
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
sha256 = RULES_JVM_EXTERNAL_SHA,
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
)

load("@rules_jvm_external//:defs.bzl", "maven_install")

maven_install(
artifacts = [
"com.google.dagger:dagger-android-support:2.22.1",
],
repositories = [
"https://jcenter.bintray.com/",
"https://maven.google.com",
"https://repo1.maven.org/maven2",
],
)

android_sdk_repository(name = "androidsdk")
1 change: 1 addition & 0 deletions third_party/jetifier/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exports_files(["jetifier-standalone/bin/jetifier-standalone"])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing the bat version?

188 changes: 188 additions & 0 deletions third_party/jetifier/jetifier-standalone/bin/jetifier-standalone
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
#!/usr/bin/env sh
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't you avoid this shell script stuff, and just import the jettifier standalone java and export a java_binary to execute it? Why do work the java_binary does anyway? What am I missing?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crap. didn't mean to start a review with this, just a single comment. :/

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this was just accidentally committed, as this script is just part of https://dl.google.com/dl/android/studio/jetifier-zips/1.0.0-beta07/jetifier-standalone.zip

Archive:  jetifier-standalone.zip
  Length      Date    Time    Name
---------  ---------- -----   ----
        0  09-12-2019 02:29   jetifier-standalone/
        0  09-12-2019 02:29   jetifier-standalone/lib/
    16969  09-12-2019 02:29   jetifier-standalone/lib/jetifier-standalone.jar
   165301  09-12-2019 02:26   jetifier-standalone/lib/jetifier-processor-1.0.0-beta07.jar
    52988  09-12-2019 02:13   jetifier-standalone/lib/commons-cli-1.3.1.jar
   128890  09-12-2019 02:19   jetifier-standalone/lib/jetifier-core-1.0.0-beta07.jar
    71221  09-12-2019 02:13   jetifier-standalone/lib/asm-util-6.0.jar
    77401  09-12-2019 02:13   jetifier-standalone/lib/asm-commons-6.0.jar
    48143  09-12-2019 02:13   jetifier-standalone/lib/asm-tree-6.0.jar
    95209  09-12-2019 02:13   jetifier-standalone/lib/asm-6.0.jar
   304924  09-12-2019 02:13   jetifier-standalone/lib/jdom2-2.0.6.jar
  1290549  09-12-2019 02:13   jetifier-standalone/lib/kotlin-stdlib-1.3.41.jar
   231952  09-12-2019 02:13   jetifier-standalone/lib/gson-2.8.0.jar
   162009  09-12-2019 02:13   jetifier-standalone/lib/kotlin-stdlib-common-1.3.41.jar
    17536  09-12-2019 02:13   jetifier-standalone/lib/annotations-13.0.jar
        0  09-12-2019 02:29   jetifier-standalone/bin/
     3415  09-12-2019 02:19   jetifier-standalone/bin/jetifier-standalone.bat
     6348  09-12-2019 02:19   jetifier-standalone/bin/jetifier-standalone
---------                     -------
  2672855                     18 files


#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## jetifier-standalone start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/.." >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="jetifier-standalone"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and JETIFIER_STANDALONE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/lib/jetifier-standalone.jar:$APP_HOME/lib/jetifier-processor-1.0.0-beta05.jar:$APP_HOME/lib/commons-cli-1.3.1.jar:$APP_HOME/lib/jetifier-core-1.0.0-beta05.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.31.jar:$APP_HOME/lib/gson-2.8.0.jar:$APP_HOME/lib/kotlin-stdlib-common-1.3.31.jar:$APP_HOME/lib/annotations-13.0.jar
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the jars in the PR (I see that you removed them)


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; 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
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((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" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
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" "$@"
100 changes: 100 additions & 0 deletions third_party/jetifier/jetifier-standalone/bin/jetifier-standalone.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem jetifier-standalone startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%..

@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=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

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-beta05.jar;%APP_HOME%\lib\commons-cli-1.3.1.jar;%APP_HOME%\lib\jetifier-core-1.0.0-beta05.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.31.jar;%APP_HOME%\lib\gson-2.8.0.jar;%APP_HOME%\lib\kotlin-stdlib-common-1.3.31.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%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable JETIFIER_STANDALONE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%JETIFIER_STANDALONE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
11 changes: 11 additions & 0 deletions tools/jetifier/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
load(":defs.bzl", "jetify")

jetify(
name = "jetified_dagger",
srcs = ["@maven//:v1/https/jcenter.bintray.com/com/google/dagger/dagger-android-support/2.22.1/dagger-android-support-2.22.1.aar"],
)

aar_import(
name = "jetified_dagger_aar",
aar = ":jetified_dagger",
)
35 changes: 35 additions & 0 deletions tools/jetifier/defs.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
def _jetify_impl(ctx):
srcs = ctx.attr.srcs
outfiles = []
for src in srcs:
for artifact in src.files.to_list():
jetified_outfile = ctx.actions.declare_file("jetified_" + artifact.basename)
jetify_args = ctx.actions.args()
jetify_args.add_all(["-l", "error"])
jetify_args.add_all(["-o", jetified_outfile])
jetify_args.add_all(["-i", artifact])
ctx.actions.run(
mnemonic = "Jetify",
inputs = [artifact],
outputs = [jetified_outfile],
progress_message = "Jetifying {} to create {}.".format(artifact.path, jetified_outfile.path),
executable = ctx.executable._jetifier,
arguments = [jetify_args],
use_default_shell_env = True,
)
outfiles.append(jetified_outfile)

return [DefaultInfo(files = depset(outfiles))]

jetify = rule(
attrs = {
"srcs": attr.label_list(allow_files = [".jar", ".aar"]),
"_jetifier": attr.label(
executable = True,
allow_single_file = True,
default = Label("//third_party/jetifier:jetifier-standalone/bin/jetifier-standalone"),
cfg = "host",
),
},
implementation = _jetify_impl,
)