Skip to content

Commit

Permalink
Updated several dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
leinardi committed May 22, 2021
1 parent 2662a62 commit 95cdfc1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 31 deletions.
22 changes: 11 additions & 11 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@
ext.deps = [:]
def versions = [:]
versions.android_checkstyle_plugin = "1.1.0"
versions.android_gradle_plugin = "4.1.1"
versions.android_material = "1.2.1"
versions.androidx_appcompat = "1.2.0"
versions.android_gradle_plugin = "4.2.1"
versions.android_material = "1.3.0"
versions.androidx_appcompat = "1.3.0"
versions.androidx_cardview = "1.0.0"
versions.androidx_constraintlayout = "2.0.4"
versions.androidx_recyclerview = "1.1.0"
versions.androidx_recyclerview = "1.2.0"
versions.constraint_layout = "1.1.3"
versions.detekt = "1.14.2"
versions.dokka = "1.4.32"
versions.errorprone_javac = "9+181-r4173-1"
versions.errorprone_core = "2.4.0"
versions.errorprone_plugin = "1.3.0"
versions.errorprone_plugin = "2.0.1"
versions.espresso = "3.0.1"
versions.gradle_versions_plugin = "0.36.0"
versions.gradle_versions_plugin = "0.38.0"
versions.junit = "4.12"
versions.kotlin = "1.4.20"
versions.kotlin = "1.5.0"
versions.material = "1.0.0"
versions.mockito = "2.13.3"
versions.mockito_all = "1.10.19"
versions.nullaway = "0.8.0"
versions.nullaway = "0.9.1"
versions.publish_plugin = "1.1.0"
versions.violations_plugin = "1.67"
versions.violations_plugin = "1.68.3"
ext.versions = versions

def commitCount = 'git rev-list --count HEAD'.execute().text.trim()
def build_versions = [:]
build_versions.min_sdk = 14
build_versions.target_sdk = 29
build_versions.java_version = JavaVersion.VERSION_1_7
build_versions.target_sdk = 30
build_versions.java_version = JavaVersion.VERSION_1_8
build_versions.version_code = commitCount.isNumber() ? commitCount as int : 0
build_versions.version_name = "3.1.1"
ext.build_versions = build_versions
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +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
Expand Down
21 changes: 3 additions & 18 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

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

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand All @@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
Expand All @@ -64,29 +64,14 @@ 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%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down

0 comments on commit 95cdfc1

Please sign in to comment.