diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bad86534..c2a88248 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlinVersion = "1.9.23" detekt = "1.22.0" -dependencyAnalysis = "1.19.0" +dependencyAnalysis = "1.31.0" dokka = "1.9.20" # Dokka versions no longer match Kotlin 1:1 # Android @@ -90,7 +90,7 @@ hamcrest-core = "org.hamcrest:hamcrest-core:1.3" plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" } plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } -plugin-android = "com.android.tools.build:gradle:8.0.2" +plugin-android = "com.android.tools.build:gradle:8.2.2" [plugins] detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..c1962a79 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 59bc51a2..509c4a29 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..aeb74cbb 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/gradlew.bat b/gradlew.bat index 53a6b238..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/mvicore-android/build.gradle.kts b/mvicore-android/build.gradle.kts index 750c7086..6b91e3cc 100644 --- a/mvicore-android/build.gradle.kts +++ b/mvicore-android/build.gradle.kts @@ -11,11 +11,10 @@ group = "com.github.badoo.mvicore" android { namespace = "com.badoo.mvicore.android" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 15 - targetSdk = 33 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mvicore-android/lint-baseline.xml b/mvicore-android/lint-baseline.xml index 10c7a121..03c0924e 100644 --- a/mvicore-android/lint-baseline.xml +++ b/mvicore-android/lint-baseline.xml @@ -1,15 +1,4 @@ - - - - - + diff --git a/mvicore-debugdrawer/build.gradle.kts b/mvicore-debugdrawer/build.gradle.kts index 92d7bcd2..d7846b5a 100644 --- a/mvicore-debugdrawer/build.gradle.kts +++ b/mvicore-debugdrawer/build.gradle.kts @@ -11,10 +11,9 @@ group = "com.github.badoo.mvicore" android { namespace = "com.badoo.mvicore.debugdrawer" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 19 - targetSdk = 33 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mvicore-debugdrawer/lint-baseline.xml b/mvicore-debugdrawer/lint-baseline.xml index 404a973f..03c0924e 100644 --- a/mvicore-debugdrawer/lint-baseline.xml +++ b/mvicore-debugdrawer/lint-baseline.xml @@ -1,15 +1,4 @@ - - - - - + diff --git a/mvicore-demo/mvicore-demo-app/build.gradle.kts b/mvicore-demo/mvicore-demo-app/build.gradle.kts index e7862277..834ed027 100644 --- a/mvicore-demo/mvicore-demo-app/build.gradle.kts +++ b/mvicore-demo/mvicore-demo-app/build.gradle.kts @@ -9,11 +9,10 @@ plugins { android { namespace = "com.badoo.mvicoredemo" - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "com.badoo.mvicoredemo" minSdk = 21 - targetSdk = 33 versionCode = 1 versionName = "1.0" diff --git a/mvicore-demo/mvicore-demo-app/lint-baseline.xml b/mvicore-demo/mvicore-demo-app/lint-baseline.xml index a4b90f49..03c0924e 100644 --- a/mvicore-demo/mvicore-demo-app/lint-baseline.xml +++ b/mvicore-demo/mvicore-demo-app/lint-baseline.xml @@ -1,15 +1,4 @@ - - - - - + diff --git a/mvicore-demo/mvicore-demo-catapi/build.gradle.kts b/mvicore-demo/mvicore-demo-catapi/build.gradle.kts index 7e174647..ba4397b4 100644 --- a/mvicore-demo/mvicore-demo-catapi/build.gradle.kts +++ b/mvicore-demo/mvicore-demo-catapi/build.gradle.kts @@ -7,11 +7,10 @@ plugins { android { namespace = "com.badoo.catapi" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mvicore-demo/mvicore-demo-catapi/lint-baseline.xml b/mvicore-demo/mvicore-demo-catapi/lint-baseline.xml index a078b8f0..03c0924e 100644 --- a/mvicore-demo/mvicore-demo-catapi/lint-baseline.xml +++ b/mvicore-demo/mvicore-demo-catapi/lint-baseline.xml @@ -1,15 +1,4 @@ - - - - - + diff --git a/mvicore-demo/mvicore-demo-feature1/build.gradle.kts b/mvicore-demo/mvicore-demo-feature1/build.gradle.kts index f8472ce1..15c32b1f 100644 --- a/mvicore-demo/mvicore-demo-feature1/build.gradle.kts +++ b/mvicore-demo/mvicore-demo-feature1/build.gradle.kts @@ -7,11 +7,10 @@ plugins { android { namespace = "com.badoo.feature1" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mvicore-demo/mvicore-demo-feature1/lint-baseline.xml b/mvicore-demo/mvicore-demo-feature1/lint-baseline.xml index a078b8f0..03c0924e 100644 --- a/mvicore-demo/mvicore-demo-feature1/lint-baseline.xml +++ b/mvicore-demo/mvicore-demo-feature1/lint-baseline.xml @@ -1,15 +1,4 @@ - - - - - + diff --git a/mvicore-demo/mvicore-demo-feature2/build.gradle.kts b/mvicore-demo/mvicore-demo-feature2/build.gradle.kts index c9de4f91..75c12d23 100644 --- a/mvicore-demo/mvicore-demo-feature2/build.gradle.kts +++ b/mvicore-demo/mvicore-demo-feature2/build.gradle.kts @@ -8,11 +8,10 @@ plugins { android { namespace = "com.badoo.feature2" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mvicore-demo/mvicore-demo-feature2/lint-baseline.xml b/mvicore-demo/mvicore-demo-feature2/lint-baseline.xml index 8a6a0f81..03c0924e 100644 --- a/mvicore-demo/mvicore-demo-feature2/lint-baseline.xml +++ b/mvicore-demo/mvicore-demo-feature2/lint-baseline.xml @@ -1,15 +1,4 @@ - - - - - + diff --git a/mvicore-plugin/idea/build.gradle.kts b/mvicore-plugin/idea/build.gradle.kts index cd96ddb8..985b49a9 100644 --- a/mvicore-plugin/idea/build.gradle.kts +++ b/mvicore-plugin/idea/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("java") id("kotlin") - id("org.jetbrains.intellij") version "1.15.0" + id("org.jetbrains.intellij") version "1.17.3" id("idea") id("mvi-core-detekt") } diff --git a/mvicore-plugin/templates/build.gradle.kts b/mvicore-plugin/templates/build.gradle.kts index 9b0660ad..09793fb3 100644 --- a/mvicore-plugin/templates/build.gradle.kts +++ b/mvicore-plugin/templates/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.jetbrains.intellij") version "1.15.0" + id("org.jetbrains.intellij") version "1.17.3" } group = "com.badoo.mvicore" diff --git a/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt b/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt index 17b54843..be11a578 100644 --- a/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt +++ b/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt @@ -16,7 +16,7 @@ class LintPlugin : Plugin { } private fun collectLintSarif(target: Project) { - target.extensions.configure>("android") { + target.extensions.configure>("android") { lint { sarifReport = true baseline = target.file("lint-baseline.xml")