1
0
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-09-20 00:49:10 -05:00

Bump gradle from 3.4.2 to 3.5.0 (#469)

This commit is contained in:
dependabot-preview[bot] 2019-08-23 18:37:05 +00:00 committed by GitHub
parent c3596aa45c
commit 0d514b7dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 183 additions and 146 deletions

View File

@ -201,7 +201,7 @@
android:focusable="true" android:focusable="true"
android:text="@string/all_close" android:text="@string/all_close"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="15sp" /> android:textSize="15sp" />
</RelativeLayout> </RelativeLayout>

View File

@ -31,7 +31,7 @@
android:layout_below="@+id/gradeHeaderSubject" android:layout_below="@+id/gradeHeaderSubject"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
@ -45,7 +45,7 @@
android:layout_toEndOf="@+id/gradeHeaderAverage" android:layout_toEndOf="@+id/gradeHeaderAverage"
android:layout_toRightOf="@+id/gradeHeaderAverage" android:layout_toRightOf="@+id/gradeHeaderAverage"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" /> android:textSize="12sp" />
<ImageView <ImageView

View File

@ -50,7 +50,7 @@
android:layout_alignBottom="@+id/attendanceItemNumber" android:layout_alignBottom="@+id/attendanceItemNumber"
android:maxLines="1" android:maxLines="1"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" /> android:textSize="12sp" />
<ImageView <ImageView

View File

@ -55,7 +55,7 @@
android:layout_marginRight="40dp" android:layout_marginRight="40dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" android:textSize="12sp"
tools:text="@tools:sample/lorem" /> tools:text="@tools:sample/lorem" />

View File

@ -45,7 +45,7 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" android:textSize="12sp"
tools:text="@tools:sample/lorem" /> tools:text="@tools:sample/lorem" />

View File

@ -18,7 +18,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
app:srcCompat="@drawable/ic_more_settings_24dp" app:srcCompat="@drawable/ic_more_settings_24dp"
app:tint="?android:attr/android:textColorSecondary" /> app:tint="?android:textColorSecondary" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/moreItemTitle" android:id="@+id/moreItemTitle"

View File

@ -50,7 +50,7 @@
android:layout_alignBottom="@+id/timetableItemNumber" android:layout_alignBottom="@+id/timetableItemNumber"
android:maxLines="1" android:maxLines="1"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
@ -66,7 +66,7 @@
android:layout_toRightOf="@+id/timetableItemTime" android:layout_toRightOf="@+id/timetableItemTime"
android:maxLines="1" android:maxLines="1"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="?android:attr/android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="12sp" android:textSize="12sp"
tools:ignore="RelativeOverlap" /> tools:ignore="RelativeOverlap" />

View File

@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.google.gms:google-services:4.3.1' classpath 'com.google.gms:google-services:4.3.1'
classpath "io.fabric.tools:gradle:1.31.0" classpath "io.fabric.tools:gradle:1.31.0"
classpath "com.github.triplet.gradle:play-publisher:2.2.1" classpath "com.github.triplet.gradle:play-publisher:2.2.1"

Binary file not shown.

View File

@ -1,6 +1,5 @@
#Thu Apr 18 00:26:43 CEST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

116
gradlew vendored
View File

@ -1,4 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env sh
#
# 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.
#
############################################################################## ##############################################################################
## ##
@ -6,42 +22,6 @@
## ##
############################################################################## ##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# 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
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" PRG="$0"
@ -60,6 +40,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`" APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# 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/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@ -85,7 +105,7 @@ location of your Java installation."
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n` MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@ -150,11 +170,19 @@ if $cygwin ; then
esac esac
fi fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules # Escape application args
function splitJvmOpts() { save () {
JVM_OPTS=("$@") for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
} }
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS APP_ARGS=$(save "$@")
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$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" "$@"

190
gradlew.bat vendored
View File

@ -1,90 +1,100 @@
@if "%DEBUG%" == "" @echo off @rem
@rem ########################################################################## @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Gradle startup script for Windows @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem @rem you may not use this file except in compliance with the License.
@rem ########################################################################## @rem You may obtain a copy of the License at
@rem
@rem Set local scope for the variables with windows NT shell @rem http://www.apache.org/licenses/LICENSE-2.0
if "%OS%"=="Windows_NT" setlocal @rem
@rem Unless required by applicable law or agreed to in writing, software
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem distributed under the License is distributed on an "AS IS" BASIS,
set DEFAULT_JVM_OPTS= @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
set DIRNAME=%~dp0 @rem limitations under the License.
if "%DIRNAME%" == "" set DIRNAME=. @rem
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% @if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem Find java.exe @rem
if defined JAVA_HOME goto findJavaFromJavaHome @rem Gradle startup script for Windows
@rem
set JAVA_EXE=java.exe @rem ##########################################################################
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. set DIRNAME=%~dp0
echo. if "%DIRNAME%" == "" set DIRNAME=.
echo Please set the JAVA_HOME variable in your environment to match the set APP_BASE_NAME=%~n0
echo location of your Java installation. set APP_HOME=%DIRNAME%
goto fail @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% @rem Find java.exe
set JAVA_EXE=%JAVA_HOME%/bin/java.exe if defined JAVA_HOME goto findJavaFromJavaHome
if exist "%JAVA_EXE%" goto init set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
echo. if "%ERRORLEVEL%" == "0" goto init
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo location of your Java installation. echo.
echo Please set the JAVA_HOME variable in your environment to match the
goto fail echo location of your Java installation.
:init goto fail
@rem Get command-line arguments, handling Windowz variants
:findJavaFromJavaHome
if not "%OS%" == "Windows_NT" goto win9xME_args set JAVA_HOME=%JAVA_HOME:"=%
if "%@eval[2+2]" == "4" goto 4NT_args set JAVA_EXE=%JAVA_HOME%/bin/java.exe
:win9xME_args if exist "%JAVA_EXE%" goto init
@rem Slurp the command line arguments.
set CMD_LINE_ARGS= echo.
set _SKIP=2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
:win9xME_args_slurp echo Please set the JAVA_HOME variable in your environment to match the
if "x%~1" == "x" goto execute echo location of your Java installation.
set CMD_LINE_ARGS=%* goto fail
goto execute
:init
:4NT_args @rem Get command-line arguments, handling Windows variants
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$ if not "%OS%" == "Windows_NT" goto win9xME_args
:execute :win9xME_args
@rem Setup the command line @rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set _SKIP=2
@rem Execute Gradle :win9xME_args_slurp
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% if "x%~1" == "x" goto execute
:end set CMD_LINE_ARGS=%*
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd :execute
@rem Setup the command line
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 @rem Execute Gradle
exit /b 1 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:mainEnd :end
if "%OS%"=="Windows_NT" endlocal @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:omega
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega