From 070c7d25ecc4d188ff0d69b89cbfb96cfb556e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=B6ffken?= Date: Tue, 10 Nov 2026 19:06:37 +0100 Subject: [PATCH 1/3] Update AGP to 9.5.1 Using the Android Studio update functionality --- app/build.gradle | 2 +- gradle.properties | 10 ++++++++++ gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- nestedscrollwebview/build.gradle | 9 +++++++-- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fa9f6bf..f938fea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ plugins { } android { - compileSdk libs.versions.compileSdk.get().toInteger() + compileSdk = libs.versions.compileSdk.get().toInteger() defaultConfig { applicationId "com.telefonica.nestedscrollwebviewdemo" diff --git a/gradle.properties b/gradle.properties index cf0008d..8665be9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,3 +22,13 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.nonFinalResIds=false +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f2c81d5..add7858 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,9 +4,9 @@ minSdk = "21" targetSdk = "34" versionCode = "1" versionName = "1.0" -agp = "8.13.1" +agp = "9.5.1" kotlin = "1.8.0" -kotlinAndroid = "2.1.20" +kotlinAndroid = "2.4.21" nexusStaging = "0.30.0" nexusPublish = "2.0.0" detekt = "1.23.8" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..7e7d24f 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-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/nestedscrollwebview/build.gradle b/nestedscrollwebview/build.gradle index 49f0a9d..831ea99 100644 --- a/nestedscrollwebview/build.gradle +++ b/nestedscrollwebview/build.gradle @@ -6,11 +6,10 @@ plugins { android { namespace 'com.telefonica.nestedscrollwebview' - compileSdk libs.versions.compileSdk.get().toInteger() + compileSdk = libs.versions.compileSdk.get().toInteger() defaultConfig { minSdk libs.versions.minSdk.get().toInteger() - targetSdk libs.versions.targetSdk.get().toInteger() consumerProguardFiles "consumer-rules.pro" } @@ -27,6 +26,12 @@ android { kotlinOptions { jvmTarget = '1.8' } + lint { + targetSdk 34 + } + testOptions { + targetSdk 34 + } } dependencies { From 1dca15d313e2fab3a2b48f3d9d5762648eed8167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=B6ffken?= Date: Tue, 10 Nov 2026 19:14:08 +0100 Subject: [PATCH 2/3] Migrate to built-in Kotlin See https://developer.android.com/build/migrate-to-built-in-kotlin#groovy --- .gitignore | 3 +++ app/build.gradle | 6 ------ build.gradle | 1 - gradle.properties | 1 - gradle/libs.versions.toml | 2 -- nestedscrollwebview/build.gradle | 4 ---- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index dc0fe12..bd3ce89 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,6 @@ lint/generated/ lint/outputs/ lint/tmp/ # lint/reports/ + +# kotlin +.kotlin diff --git a/app/build.gradle b/app/build.gradle index f938fea..bbae4ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) } android { @@ -26,11 +25,6 @@ android { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - kotlin { - compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) - } - } buildFeatures { viewBinding true } diff --git a/build.gradle b/build.gradle index 659de66..07c7e1b 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,6 @@ buildscript { plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.nexus.publish) apply false alias(libs.plugins.detekt) } diff --git a/gradle.properties b/gradle.properties index 8665be9..223f0be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,5 +30,4 @@ android.uniquePackageNames=false android.dependency.useConstraints=true android.r8.strictFullModeForKeepRules=false android.r8.optimizedResourceShrinking=false -android.builtInKotlin=false android.newDsl=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index add7858..1b39476 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,6 @@ versionCode = "1" versionName = "1.0" agp = "9.5.1" kotlin = "1.8.0" -kotlinAndroid = "2.4.21" nexusStaging = "0.30.0" nexusPublish = "2.0.0" detekt = "1.23.8" @@ -30,6 +29,5 @@ junit4 = { module = "junit:junit", version.ref = "junit4" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" } nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublish" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } diff --git a/nestedscrollwebview/build.gradle b/nestedscrollwebview/build.gradle index 831ea99..571940d 100644 --- a/nestedscrollwebview/build.gradle +++ b/nestedscrollwebview/build.gradle @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { @@ -23,9 +22,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' - } lint { targetSdk 34 } From d37f39cf391e3225ee714cb097a4d50f3b009f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=B6ffken?= Date: Tue, 10 Nov 2026 19:23:25 +0100 Subject: [PATCH 3/3] Update all dependencies --- gradle/libs.versions.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1b39476..5958aa7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -compileSdk = "34" -minSdk = "21" -targetSdk = "34" +compileSdk = "37" +minSdk = "23" +targetSdk = "37" versionCode = "1" versionName = "1.0" agp = "9.5.1" -kotlin = "1.8.0" +kotlin = "1.19.1" nexusStaging = "0.30.0" nexusPublish = "2.0.0" detekt = "1.23.8" -material = "1.6.1" -appcompat = "1.4.2" -constraintlayout = "2.1.4" -swiperefresh = "1.1.0" +material = "1.14.0" +appcompat = "1.8.0" +constraintlayout = "2.2.2" +swiperefresh = "1.2.0" junit4 = "4.13.2" [libraries]