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 fa9f6bf..bbae4ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,11 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) } android { - compileSdk libs.versions.compileSdk.get().toInteger() + compileSdk = libs.versions.compileSdk.get().toInteger() defaultConfig { applicationId "com.telefonica.nestedscrollwebviewdemo" @@ -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 cf0008d..223f0be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,3 +22,12 @@ 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.newDsl=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f2c81d5..5958aa7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,18 @@ [versions] -compileSdk = "34" -minSdk = "21" -targetSdk = "34" +compileSdk = "37" +minSdk = "23" +targetSdk = "37" versionCode = "1" versionName = "1.0" -agp = "8.13.1" -kotlin = "1.8.0" -kotlinAndroid = "2.1.20" +agp = "9.5.1" +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] @@ -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/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..571940d 100644 --- a/nestedscrollwebview/build.gradle +++ b/nestedscrollwebview/build.gradle @@ -1,16 +1,14 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } 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" } @@ -24,8 +22,11 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' + lint { + targetSdk 34 + } + testOptions { + targetSdk 34 } }