Skip to content

Commit 5765cfe

Browse files
ANDROID-17069 update agp to version 8.13.1, libs.versions.toml integration
1 parent c28b86f commit 5765cfe

File tree

6 files changed

+66
-28
lines changed

6 files changed

+66
-28
lines changed

app/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ plugins {
44
}
55

66
android {
7-
compileSdk 31
7+
compileSdk libs.versions.compileSdk.get().toInteger()
88

99
defaultConfig {
1010
applicationId "com.telefonica.nestedscrollwebviewdemo"
11-
minSdk 21
12-
targetSdk 31
13-
versionCode 1
14-
versionName "1.0"
11+
minSdk libs.versions.minSdk.get().toInteger()
12+
targetSdk libs.versions.targetSdk.get().toInteger()
13+
versionCode libs.versions.versionCode.get().toInteger()
14+
versionName libs.versions.versionName.get()
1515
}
1616

1717
buildTypes {
@@ -30,13 +30,14 @@ android {
3030
buildFeatures {
3131
viewBinding true
3232
}
33+
namespace 'com.telefonica.nestedscrollwebviewdemo'
3334
}
3435

3536
dependencies {
3637
implementation project(':nestedscrollwebview')
37-
implementation 'androidx.core:core-ktx:1.8.0'
38-
implementation 'androidx.appcompat:appcompat:1.4.2'
39-
implementation 'com.google.android.material:material:1.6.1'
40-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
41-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
38+
implementation(libs.androidx.core.ktx)
39+
implementation(libs.material)
40+
implementation(libs.appcompat)
41+
implementation(libs.constraintlayout)
42+
implementation(libs.swiperefreshlayout)
4243
}

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
dependencies {
4-
classpath "com.android.tools.build:gradle:7.1.3"
5-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
6-
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
4+
classpath libs.agp.buildscript
5+
classpath libs.kotlin.gradle
6+
classpath libs.nexus.staging
77
}
88
}
99

1010
plugins {
11-
id 'com.android.application' version '7.4.2' apply false
12-
id 'com.android.library' version '7.4.2' apply false
13-
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
14-
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
15-
id 'io.gitlab.arturbosch.detekt' version '1.22.0'
11+
alias(libs.plugins.android.application) apply false
12+
alias(libs.plugins.android.library) apply false
13+
alias(libs.plugins.kotlin.android) apply false
14+
alias(libs.plugins.nexus.publish) apply false
15+
alias(libs.plugins.detekt)
1616
}
1717

1818
detekt {

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ kotlin.code.style=official
2121
# resources declared in the library itself and none from the library's dependencies,
2222
# thereby reducing the size of the R class for that library
2323
android.nonTransitiveRClass=true
24+
android.defaults.buildfeatures.buildconfig=true
25+
android.nonFinalResIds=false

gradle/libs.versions.toml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[versions]
2+
compileSdk = "31"
3+
minSdk = "21"
4+
targetSdk = "31"
5+
versionCode = "1"
6+
versionName = "1.0"
7+
agp = "8.13.1"
8+
kotlin = "1.8.0"
9+
kotlinAndroid = "1.6.21"
10+
nexusStaging = "0.30.0"
11+
nexusPublish = "1.3.0"
12+
detekt = "1.22.0"
13+
material = "1.6.1"
14+
appcompat = "1.4.2"
15+
constraintlayout = "2.1.4"
16+
swiperefresh = "1.1.0"
17+
junit4 = "4.13.2"
18+
19+
[libraries]
20+
agp-buildscript = { module = "com.android.tools.build:gradle", version.ref = "agp" }
21+
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
22+
nexus-staging = { module = "io.codearte.gradle.nexus:gradle-nexus-staging-plugin", version.ref = "nexusStaging" }
23+
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "kotlin" }
24+
material = { module = "com.google.android.material:material", version.ref = "material" }
25+
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
26+
constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
27+
swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefresh" }
28+
junit4 = { module = "junit:junit", version.ref = "junit4" }
29+
30+
[plugins]
31+
android-application = { id = "com.android.application", version.ref = "agp" }
32+
android-library = { id = "com.android.library", version.ref = "agp" }
33+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" }
34+
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublish" }
35+
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Aug 03 11:27:29 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

nestedscrollwebview/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
plugins {
2-
id 'com.android.library'
3-
id 'org.jetbrains.kotlin.android'
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
44
}
55

66
android {
7-
compileSdk 31
7+
compileSdk libs.versions.compileSdk.get().toInteger()
88

99
defaultConfig {
10-
minSdk 21
11-
targetSdk 31
12-
10+
minSdk libs.versions.minSdk.get().toInteger()
11+
targetSdk libs.versions.targetSdk.get().toInteger()
1312
consumerProguardFiles "consumer-rules.pro"
1413
}
1514

@@ -26,13 +25,14 @@ android {
2625
kotlinOptions {
2726
jvmTarget = '1.8'
2827
}
28+
namespace 'com.telefonica.nestedscrollwebview'
2929
}
3030

3131
dependencies {
32-
implementation 'androidx.core:core-ktx:1.8.0'
33-
implementation 'com.google.android.material:material:1.6.1'
32+
implementation(libs.androidx.core.ktx)
33+
implementation(libs.material)
3434

35-
testImplementation 'junit:junit:4.13.2'
35+
testImplementation(libs.junit4)
3636
}
3737

3838
apply from: "${rootProject.projectDir}/mavencentral.gradle"

0 commit comments

Comments
 (0)