diff --git a/dependencies.gradle b/dependencies.gradle index 52463fc7..ea05210e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,10 +2,11 @@ ext.versions = [ minSdk : 14, targetSdk : 29, compileSdk : 29, - gradle : '6.5', + // You need to run ./gradlew wrapper after updating the version + gradle : '7.0', navigation : "2.3.2", - gradlePlugin : "4.1.3", + gradlePlugin : "4.2.0", androidxcore : "1.5.0-rc01", ktlint : "0.37.1", ktlintGradle : "9.2.1", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c44b679a..e708b1c0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dd59c260..3c4101c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Jun 13 17:12:11 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/gradle_scripts/jacoco.gradle b/gradle_scripts/jacoco.gradle index 0528457c..b7f3cdc5 100644 --- a/gradle_scripts/jacoco.gradle +++ b/gradle_scripts/jacoco.gradle @@ -6,7 +6,7 @@ jacoco { def mergedJacocoExec = file("${project.buildDir}/jacoco/jacocoMerged.exec") -tasks.create(name: 'jacocoMergeReports', type: JacocoMerge) { +def merge = tasks.register('jacocoMergeReports', JacocoMerge) { group = "Reporting" description = "Merge all jacoco reports from projects into one." @@ -27,7 +27,8 @@ tasks.create(name: 'jacocoMergeReports', type: JacocoMerge) { destinationFile(mergedJacocoExec) } -tasks.create(name: 'jacocoFullReport', type: JacocoReport, dependsOn: 'jacocoMergeReports') { +tasks.register('jacocoFullReport', JacocoReport) { + dependsOn merge group = "Reporting" description = "Generate full Jacoco coverage report including all modules." @@ -46,47 +47,46 @@ tasks.create(name: 'jacocoFullReport', type: JacocoReport, dependsOn: 'jacocoMer // Task will run anyway even if initial inputs are empty onlyIf = { true } - doFirst { - project.subprojects { subproject -> - subproject.plugins.withId("jacoco") { - project.logger.info("${subproject.name} has Jacoco plugin applied") - subproject.plugins.withId("kotlin-android") { - project.logger.info("${subproject.name} is android project") - def mainSources = subproject.extensions.findByName("android").sourceSets['main'] - project.logger.info("Android sources: ${mainSources.java.srcDirs}") - mainSources.java.srcDirs.forEach { - additionalSourceDirs(it) - } - project.logger.info("Subproject exclude: ${subproject.jacocoExclude}") - additionalClassDirs(fileTree( - dir: "${subproject.buildDir}/tmp/kotlin-classes/debug", - excludes: subproject.jacocoExclude - )) + project.subprojects { subproject -> + subproject.plugins.withId("jacoco") { + project.logger.info("${subproject.name} has Jacoco plugin applied") + subproject.plugins.withId("kotlin-android") { + project.logger.info("${subproject.name} is android project") + def mainSources = subproject.extensions.findByName("android").sourceSets['main'] + project.logger.info("Android sources: ${mainSources.java.srcDirs}") + mainSources.java.srcDirs.forEach { + additionalSourceDirs(it) } - subproject.plugins.withId("kotlin") { plugin -> - project.logger.info("${subproject.name} is common kotlin project") - SourceDirectorySet mainSources = subproject.extensions.getByName("kotlin") - .sourceSets[SourceSet.MAIN_SOURCE_SET_NAME] - .kotlin - mainSources.srcDirs.forEach { - project.logger.debug("Adding sources: $it") - additionalSourceDirs(it) - } - project.logger.info("Subproject exclude: ${subproject.jacocoExclude}") - additionalClassDirs(fileTree( - dir: "${subproject.buildDir}/classes/kotlin/main", - excludes: subproject.jacocoExclude - )) + project.logger.info("Subproject exclude: ${subproject.jacocoExclude}") + additionalClassDirs(fileTree( + dir: "${subproject.buildDir}/tmp/kotlin-classes/debug", + excludes: subproject.jacocoExclude + )) + } + subproject.plugins.withId("kotlin") { plugin -> + project.logger.info("${subproject.name} is common kotlin project") + SourceDirectorySet mainSources = subproject.extensions.getByName("kotlin") + .sourceSets[SourceSet.MAIN_SOURCE_SET_NAME] + .kotlin + mainSources.srcDirs.forEach { + project.logger.debug("Adding sources: $it") + additionalSourceDirs(it) } + project.logger.info("Subproject exclude: ${subproject.jacocoExclude}") + additionalClassDirs(fileTree( + dir: "${subproject.buildDir}/classes/kotlin/main", + excludes: subproject.jacocoExclude + )) + } - subproject.tasks.withType(Test) { task -> - File destFile = task.extensions.getByType(JacocoTaskExtension.class).destinationFile - if (destFile.exists() && !task.name.contains("Release")) { - project.logger.info("Adding execution data: $destFile") - executionData(destFile) - } + subproject.tasks.withType(Test) { task -> + File destFile = task.extensions.getByType(JacocoTaskExtension.class).destinationFile + if (destFile.exists() && !task.name.contains("Release")) { + project.logger.info("Adding execution data: $destFile") + executionData(destFile) } } } } + } diff --git a/gradle_scripts/kotlin-module-bootstrap.gradle b/gradle_scripts/kotlin-module-bootstrap.gradle index 7dc53a05..ac732a7f 100644 --- a/gradle_scripts/kotlin-module-bootstrap.gradle +++ b/gradle_scripts/kotlin-module-bootstrap.gradle @@ -10,9 +10,6 @@ sourceSets { test.resources.srcDirs += "${projectDir}/src/integrationTest/resources" } -test { - useJUnitPlatform() -} dependencies { api other.kotlinStdlib @@ -44,15 +41,17 @@ jacocoTestReport { } } -test.finalizedBy jacocoTestReport -test { +tasks.named("test").configure { + useJUnitPlatform() jacoco { excludes += jacocoExclude includeNoLocationClasses = true } + finalizedBy jacocoTestReport } -tasks.create(name: "ciTest", dependsOn: "test") { +tasks.register("ciTest") { + dependsOn test group = "Verification" description = "Special task for CI that calls all tests in pure kotlin modules" } diff --git a/gradlew b/gradlew index cccdd3d5..4f906e0c 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/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 +# +# https://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. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ 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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -109,10 +126,11 @@ 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 +# For Cygwin or MSYS, switch paths to Windows format before running java +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 @@ -138,19 +156,19 @@ if $cygwin ; 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 @@ -159,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 $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" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 https://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 @@ -13,15 +29,18 @@ 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 GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @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 +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,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% @@ -45,28 +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