Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,6 @@ lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

# kotlin
.kotlin
8 changes: 1 addition & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -26,11 +25,6 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
buildFeatures {
viewBinding true
}
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
9 changes: 9 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 9 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 6 additions & 5 deletions nestedscrollwebview/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}

Expand All @@ -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
}
}

Expand Down
Loading