From 2aaddc0284c86394c7310dfb722b82fe881d5289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Wed, 22 Jul 2026 22:03:49 +0200 Subject: [PATCH 1/2] Update compileSdk and targetSdk to 37 Co-Authored-By: Claude Fable 5 --- .../test/kotlin/com/slack/keeper/KeeperFunctionalTest.kt | 4 ++-- samples/gradle.properties | 3 ++- samples/sample-libraries/a/build.gradle | 2 +- samples/sample-libraries/b/build.gradle | 2 +- samples/sample-libraries/test-only-android/build.gradle | 2 +- samples/sample/build.gradle.kts | 6 +++--- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/keeper-gradle-plugin/src/test/kotlin/com/slack/keeper/KeeperFunctionalTest.kt b/keeper-gradle-plugin/src/test/kotlin/com/slack/keeper/KeeperFunctionalTest.kt index bce19237..3ee8ac95 100644 --- a/keeper-gradle-plugin/src/test/kotlin/com/slack/keeper/KeeperFunctionalTest.kt +++ b/keeper-gradle-plugin/src/test/kotlin/com/slack/keeper/KeeperFunctionalTest.kt @@ -415,13 +415,13 @@ private fun buildGradleFile( tasks.withType(KotlinCompile).configureEach { compilerOptions { jvmTarget.set(JvmTarget.JVM_11) } } android { - compileSdk = 36 + compileSdk = 37 namespace "com.slack.keeper.sample" defaultConfig { applicationId "com.slack.keeper.sample" minSdk = 21 - targetSdk = 36 + targetSdk = 37 } compileOptions { diff --git a/samples/gradle.properties b/samples/gradle.properties index 679e2d6e..0737a033 100644 --- a/samples/gradle.properties +++ b/samples/gradle.properties @@ -2,4 +2,5 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.configuration-cache=true org.gradle.configuration-cache.parallel=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +org.gradle.tooling.parallel=true diff --git a/samples/sample-libraries/a/build.gradle b/samples/sample-libraries/a/build.gradle index bdad819a..6f4f69c4 100644 --- a/samples/sample-libraries/a/build.gradle +++ b/samples/sample-libraries/a/build.gradle @@ -19,7 +19,7 @@ plugins { } android { - compileSdk = 36 + compileSdk = 37 namespace = "com.slack.keeper.sample.a" defaultConfig { diff --git a/samples/sample-libraries/b/build.gradle b/samples/sample-libraries/b/build.gradle index 9198421e..0e22a0e6 100644 --- a/samples/sample-libraries/b/build.gradle +++ b/samples/sample-libraries/b/build.gradle @@ -19,7 +19,7 @@ plugins { } android { - compileSdk = 36 + compileSdk = 37 namespace = "com.slack.keeper.sample.b" defaultConfig { diff --git a/samples/sample-libraries/test-only-android/build.gradle b/samples/sample-libraries/test-only-android/build.gradle index 9a3f3227..9cdd8d78 100644 --- a/samples/sample-libraries/test-only-android/build.gradle +++ b/samples/sample-libraries/test-only-android/build.gradle @@ -19,7 +19,7 @@ plugins { } android { - compileSdk = 36 + compileSdk = 37 namespace = "com.slack.keeper.sample.testonlyandroid" defaultConfig { diff --git a/samples/sample/build.gradle.kts b/samples/sample/build.gradle.kts index 73fe515c..972bcb82 100644 --- a/samples/sample/build.gradle.kts +++ b/samples/sample/build.gradle.kts @@ -38,13 +38,13 @@ if (Version.ANDROID_GRADLE_PLUGIN_VERSION.startsWith("8.")) { } android { - compileSdk = 36 + compileSdk = 37 namespace = "com.slack.keeper.sample" defaultConfig { applicationId = "com.slack.keeper.example" - minSdk = 21 - targetSdk = 36 + minSdk = 29 + targetSdk = 37 versionCode = 1 versionName = "1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From 1433a0dc5adae5b7f0c29ea88eab5683912f39ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2026 20:10:42 +0000 Subject: [PATCH 2/2] Update Gradle to v9.6.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- samples/gradle/wrapper/gradle-wrapper.properties | 2 +- samples/gradlew | 4 ++-- samples/gradlew.bat | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df6a6ad7..a9db1155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew b/gradlew index b9bb139f..249efbb0 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/gradlew.bat b/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/samples/gradle/wrapper/gradle-wrapper.properties b/samples/gradle/wrapper/gradle-wrapper.properties index df6a6ad7..a9db1155 100644 --- a/samples/gradle/wrapper/gradle-wrapper.properties +++ b/samples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/samples/gradlew b/samples/gradlew index b9bb139f..249efbb0 100755 --- a/samples/gradlew +++ b/samples/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/samples/gradlew.bat b/samples/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/samples/gradlew.bat +++ b/samples/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel