Skip to content
Merged
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
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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._
- [ ] ...
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following ticket is created to do corresponding migration to "shared-workflows": https://jira.tid.es/browse/ANDROID-16907

Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v2.3.5

- 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
Expand Down
17 changes: 11 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
compileSdk 31
compileSdk 34

defaultConfig {
applicationId "com.telefonica.nestedscrollwebviewdemo"
minSdk 21
targetSdk 31
targetSdk 34
versionCode 1
versionName "1.0"
}
Expand All @@ -21,15 +23,18 @@ 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
}
namespace 'com.telefonica.nestedscrollwebviewdemo'
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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"/>

Expand Down
35 changes: 21 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,36 +1,43 @@
import io.gitlab.arturbosch.detekt.Detekt

// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:7.1.3"
classpath 'com.android.tools.build:gradle:8.11.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
}
}

plugins {
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
id 'com.android.application' version '8.11.2' apply false
id 'com.android.library' version '8.11.2' apply false
id 'org.jetbrains.kotlin.android' version '2.1.20' apply false
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
id 'io.gitlab.arturbosch.detekt' version '1.22.0'
id 'io.gitlab.arturbosch.detekt' version '1.23.8'
}

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 {
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I followed the Android Studio AGP assistant update to do this task quicker and it added this line.
Checking the documentation:
https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes?hl=es-419#default-changes

This line disables the new generation of non-final resources introduced in AGP, causing R ID's to return to final. It's usually added automatically when you migrate an old project to maintain compatibility, although it's recommended to gradually remove this dependency and leave it as true (or simply not declare it, since the current default is true).

If you consider necessary I would remove this line. WDYT?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, no problem, we can maintain it

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Aug 03 11:27:29 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-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
Loading
Loading