Skip to content

Commit b76098d

Browse files
committed
ANDROID-16201/update-api-34:
- Update AGP 7.4 --> 8.11 - compileSdk and targetSdk 31 --> 34
1 parent ae2f99a commit b76098d

File tree

10 files changed

+205
-135
lines changed

10 files changed

+205
-135
lines changed

app/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdk 31
7+
compileSdk 34
88

99
defaultConfig {
1010
applicationId "com.telefonica.nestedscrollwebviewdemo"
1111
minSdk 21
12-
targetSdk 31
12+
targetSdk 34
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -21,15 +21,16 @@ android {
2121
}
2222
}
2323
compileOptions {
24-
sourceCompatibility JavaVersion.VERSION_1_8
25-
targetCompatibility JavaVersion.VERSION_1_8
24+
sourceCompatibility JavaVersion.VERSION_17
25+
targetCompatibility JavaVersion.VERSION_17
2626
}
2727
kotlinOptions {
28-
jvmTarget = '1.8'
28+
jvmTarget = '17'
2929
}
3030
buildFeatures {
3131
viewBinding true
3232
}
33+
namespace 'com.telefonica.nestedscrollwebviewdemo'
3334
}
3435

3536
dependencies {

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.telefonica.nestedscrollwebviewdemo">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET"/>
76

build.gradle

Lines changed: 6 additions & 6 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"
4+
classpath 'com.android.tools.build:gradle:8.11.2'
55
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
66
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
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
11+
id 'com.android.application' version '8.11.2' apply false
12+
id 'com.android.library' version '8.11.2' apply false
13+
id 'org.jetbrains.kotlin.android' version '2.2.20' apply false
1414
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
15-
id 'io.gitlab.arturbosch.detekt' version '1.22.0'
15+
id 'io.gitlab.arturbosch.detekt' version '1.23.8'
1616
}
1717

1818
detekt {
@@ -29,7 +29,7 @@ detekt {
2929
}
3030
}
3131

32-
task clean(type: Delete) {
32+
tasks.register('clean', Delete) {
3333
delete rootProject.buildDir
3434
}
3535

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ 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.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Aug 03 11:27:29 CEST 2022
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)