mirror of
https://github.com/wulkanowy/wulkanowy.git
synced 2025-01-31 10:18:20 +01:00
Upgrade gradle wrapper to 6.6.1 (#968)
This commit is contained in:
parent
6c68456f7a
commit
b0b3ccfd53
@ -48,8 +48,8 @@ before_script:
|
|||||||
script:
|
script:
|
||||||
- ./gradlew dependencies --stacktrace --daemon
|
- ./gradlew dependencies --stacktrace --daemon
|
||||||
- fossa --no-ansi || true
|
- fossa --no-ansi || true
|
||||||
- ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
|
- ./gradlew -Pcoverage testFdroidDebugUnitTest --stacktrace --daemon
|
||||||
- ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
|
- ./gradlew -Pcoverage connectedFdroidDebugAndroidTest --stacktrace --daemon
|
||||||
- ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
|
- ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
|
||||||
- |
|
- |
|
||||||
if [ $TRAVIS_TAG ]; then
|
if [ $TRAVIS_TAG ]; then
|
||||||
|
@ -35,13 +35,13 @@ task jacocoTestReport(type: JacocoReport) {
|
|||||||
dir: "$buildDir/intermediates/classes/debug",
|
dir: "$buildDir/intermediates/classes/debug",
|
||||||
excludes: excludes
|
excludes: excludes
|
||||||
) + fileTree(
|
) + fileTree(
|
||||||
dir: "$buildDir/tmp/kotlin-classes/playDebug",
|
dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
|
||||||
excludes: excludes
|
excludes: excludes
|
||||||
))
|
))
|
||||||
|
|
||||||
sourceDirectories.setFrom(files([
|
sourceDirectories.setFrom(files([
|
||||||
"src/main/java",
|
"src/main/java",
|
||||||
"src/play/java"
|
"src/fdroid/java"
|
||||||
]))
|
]))
|
||||||
executionData.setFrom(fileTree(
|
executionData.setFrom(fileTree(
|
||||||
dir: project.projectDir,
|
dir: project.projectDir,
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<string name="homework_title">Hausaufgaben</string>
|
<string name="homework_title">Hausaufgaben</string>
|
||||||
<string name="account_title">Wählen Sie ein Konto</string>
|
<string name="account_title">Wählen Sie ein Konto</string>
|
||||||
<!--Subtitles-->
|
<!--Subtitles-->
|
||||||
<string name="grade_subtitle">Semester %d, %d/%d</string>
|
<string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
|
||||||
<!--Login-->
|
<!--Login-->
|
||||||
<string name="login_header_default">Melden Sie sich mit dem Studenten- oder Elternkonto an</string>
|
<string name="login_header_default">Melden Sie sich mit dem Studenten- oder Elternkonto an</string>
|
||||||
<string name="login_header_symbol">Geben Sie das Symbol</string>
|
<string name="login_header_symbol">Geben Sie das Symbol</string>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<string name="homework_title">Zadania domowe</string>
|
<string name="homework_title">Zadania domowe</string>
|
||||||
<string name="account_title">Wybierz konto</string>
|
<string name="account_title">Wybierz konto</string>
|
||||||
<!--Subtitles-->
|
<!--Subtitles-->
|
||||||
<string name="grade_subtitle">Semestr %d, %d/%d</string>
|
<string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
|
||||||
<!--Login-->
|
<!--Login-->
|
||||||
<string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
|
<string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
|
||||||
<string name="login_header_symbol">Podaj symbol</string>
|
<string name="login_header_symbol">Podaj symbol</string>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<string name="homework_title">Домашние задания</string>
|
<string name="homework_title">Домашние задания</string>
|
||||||
<string name="account_title">Выберите аккаунт</string>
|
<string name="account_title">Выберите аккаунт</string>
|
||||||
<!--Subtitles-->
|
<!--Subtitles-->
|
||||||
<string name="grade_subtitle">%d семестр, %d/%d</string>
|
<string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
|
||||||
<!--Login-->
|
<!--Login-->
|
||||||
<string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
|
<string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
|
||||||
<string name="login_header_symbol">Впишите \"symbol\"</string>
|
<string name="login_header_symbol">Впишите \"symbol\"</string>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<string name="homework_title">Домашні завдання</string>
|
<string name="homework_title">Домашні завдання</string>
|
||||||
<string name="account_title">Оберіть аккаунт</string>
|
<string name="account_title">Оберіть аккаунт</string>
|
||||||
<!--Subtitles-->
|
<!--Subtitles-->
|
||||||
<string name="grade_subtitle">%d семестр, %d/%d</string>
|
<string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
|
||||||
<!--Login-->
|
<!--Login-->
|
||||||
<string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батька</string>
|
<string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батька</string>
|
||||||
<string name="login_header_symbol">Впишіть \"symbol\"</string>
|
<string name="login_header_symbol">Впишіть \"symbol\"</string>
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<!--Subtitles-->
|
<!--Subtitles-->
|
||||||
<string name="grade_subtitle">Semester %d, %d/%d</string>
|
<string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
|
||||||
|
|
||||||
|
|
||||||
<!--Login-->
|
<!--Login-->
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
2
gradlew
vendored
2
gradlew
vendored
@ -82,6 +82,7 @@ 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.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
@ -129,6 +130,7 @@ fi
|
|||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
22
gradlew.bat
vendored
22
gradlew.bat
vendored
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto init
|
if "%ERRORLEVEL%" == "0" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
@ -54,7 +54,7 @@ goto fail
|
|||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto init
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
@ -64,28 +64,14 @@ echo location of your Java installation.
|
|||||||
|
|
||||||
goto fail
|
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
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@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
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
Loading…
x
Reference in New Issue
Block a user