Merge branch 'main' of github.com:Telefonica/android-nested-scroll-webview into jmanrique/ANDROID-17069-update-agp

# Conflicts:
#	app/build.gradle
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	nestedscrollwebview/build.gradle

Author: jmanriquehiberus

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+### :tickets: Jira ticket
+[ANDROID-XXXX](https://jira.tid.es/browse/ANDROID-XXXX)
+
+### :goal_net: What's the goal?
+_Provide a description of the overall goal. The description in the Jira ticket may help._
+
+### :construction: How do we do it?
+_Provide a description of the implementation. A list of steps would be ideal._
+* _Step 1_
+* _Step 2_
+* _Step 3_
+
+### :white_check_mark: Documentation changes?
+- [ ] No docs to update nor create
+
+### :test_tube: How can I test this?
+_If it cannot be tested explain why._
+- [ ] ...

.github/workflows/release.yml

@@ -20,4 +20,4 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
           ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEYID }}
         run: "bash ./gradlew publishReleasePublicationToSonatypeRepository -DLIBRARY_VERSION=${{ github.event.release.tag_name }}
-        --max-workers 1 closeAndReleaseStagingRepository"
+        --max-workers 1 closeAndReleaseStagingRepositories"

.github/workflows/snapshot.yml

@@ -22,4 +22,5 @@ jobs:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
           ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEYID }}
-        run: "bash ./gradlew publishReleasePublicationToSonatypeRepository -DSNAPSHOT_VERSION=${{ github.event.inputs.snapshotVersion }}"
+        run: "bash ./gradlew publishReleasePublicationToSonatypeRepository -DSNAPSHOT_VERSION=${{ github.event.inputs.snapshotVersion }}
+        --max-workers 1 closeAndReleaseStagingRepositories"

.github/workflows/tests.yml

@@ -7,11 +7,11 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       ## Build all our Build Types at once ##
       - name: Build all artifacts

app/build.gradle

@@ -1,6 +1,8 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -21,11 +23,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
     }
     buildFeatures {
         viewBinding true

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.telefonica.nestedscrollwebviewdemo">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

build.gradle

@@ -1,3 +1,5 @@
+import io.gitlab.arturbosch.detekt.Detekt
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     dependencies {
@@ -15,22 +17,27 @@ plugins {
     alias(libs.plugins.detekt)
 }
 
-detekt {
-    input = files(rootProject.rootDir)
-    config = files("$projectDir/detekt.yml")
+tasks.withType(Detekt).configureEach {
+    // Files to analyze
+    setSource(files(rootProject.rootDir))
+
+    // Configuration
+    config.setFrom(files("$projectDir/detekt.yml"))
     allRules = true
     buildUponDefaultConfig = true
 
     reports {
-        html.enabled = true
-        xml.enabled = true
-        xml.destination = file("$buildDir/reports/detekt/detekt-checkstyle.xml")
-        html.destination = file("$buildDir/reports/detekt/detekt-report.html")
+        html.required.set(true)
+        html.outputLocation.set(layout.buildDirectory.file("reports/detekt/detekt-report.html"))
+
+        xml.required.set(true)
+        xml.outputLocation.set(layout.buildDirectory.file("reports/detekt/detekt-checkstyle.xml"))
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
 
 allprojects {

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-compileSdk = "31"
+compileSdk = "34"
 minSdk = "21"
-targetSdk = "31"
+targetSdk = "34"
 versionCode = "1"
 versionName = "1.0"
 agp = "8.13.1"
 kotlin = "1.8.0"
-kotlinAndroid = "1.6.21"
+kotlinAndroid = "2.1.20"
 nexusStaging = "0.30.0"
-nexusPublish = "1.3.0"
-detekt = "1.22.0"
+nexusPublish = "2.0.0"
+detekt = "1.23.8"
 material = "1.6.1"
 appcompat = "1.4.2"
 constraintlayout = "2.1.4"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Wed Aug 03 11:27:29 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists