ANDROID-14153 Update AGP, target SDK, Kotlin and Compose (#326)

* ANDROID-14153 Update AGP to 8.1.2 and target sdk to 34

* ANDROID-14153 set up java 17 in GH Actions

* ANDROID-14153 fix typo in PR template

* ANDROID-14153 remove package attribute from manifest

* ANDROID-14153 revert kotlin bump version by mistake

* ANDROID-14153 move DummyActivity to debug variant

* ANDROID-14153 use ubuntu latest in test workflow

* ANDROID-14153 fix lint

* ANDROID-14153 Move DummyActivity to specific test module

* ANDROID-14153 Update kotlin and compose version

* ANDROID-14153 revert TextInput binding removal

* ANDROID-14153 revert extra lines

* check default java version during tests execution

* ANDROID-14153 remove java 17 setup on github workflows

* Revert "ANDROID-14153 remove java 17 setup on github workflows"

This reverts commit 8cbbb1a.

* Revert "check default java version during tests execution"

This reverts commit c0f3765.

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,7 @@ _Provide a description of the implementation. A list of steps would be ideal._
 ### ☑️ Checks
 - [ ] I updated the documentation, including readmes and wikis. If this is a breaking change, update [UPGRADING.md](../UPGRADING.md) to inform users how to proceed. If no updates are necessary, indicate so.
 - [ ] Tested with dark mode.
-- [ ] Tested with API 23.
+- [ ] Tested with API 21.
 
 ### :test_tube: How can I test this?
 _If it cannot be tested explain why._

.github/workflows/catalog.yml

@@ -8,16 +8,22 @@ jobs:
   catalog:
     runs-on: ubuntu-latest
     steps:
-    - name: Check pull request status
-      if: "!github.event.pull_request.merged == true"
-      run: 'echo "Skipping generation, pull request is not merged"'
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
 
-    - name: Checkout repo
-      if: github.event.pull_request.merged == true
-      uses: actions/checkout@v2
+      - name: Check pull request status
+        if: "!github.event.pull_request.merged == true"
+        run: 'echo "Skipping generation, pull request is not merged"'
 
-    - name: Publish catalog
-      if: github.event.pull_request.merged == true
-      env:
-        APPCENTER_API_TOKEN: ${{ secrets.APPCENTER_API_TOKEN }}
-      run: 'bash ./gradlew clean check appCenterAssembleAndUploadDebug -Dappcenter_app_name=Mistica'
+      - name: Checkout repo
+        if: github.event.pull_request.merged == true
+        uses: actions/checkout@v2
+
+      - name: Publish catalog
+        if: github.event.pull_request.merged == true
+        env:
+          APPCENTER_API_TOKEN: ${{ secrets.APPCENTER_API_TOKEN }}
+        run: 'bash ./gradlew clean check appCenterAssembleAndUploadDebug -Dappcenter_app_name=Mistica'

.github/workflows/compare_screenshots.yml

@@ -10,6 +10,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Checkout repo
         uses: actions/checkout@v3
 

.github/workflows/debug_catalog.yml

@@ -15,13 +15,19 @@ jobs:
   debug-catalog:
     runs-on: ubuntu-latest
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Checkout repo
         uses: actions/checkout@v3
 
       - name: Publish catalog
         env:
           APPCENTER_API_TOKEN: ${{ secrets.APPCENTER_API_TOKEN }}
-        run: 'bash ./gradlew clean check appCenterAssembleAndUploadDebug -Dappcenter_app_name=Mistica-Catalog -Dappcenter_notify=false 
+        run: 'bash ./gradlew clean appCenterAssembleAndUploadDebug -Dappcenter_app_name=Mistica-Catalog -Dappcenter_notify=false 
           -Dappcenter_notes="Testing catalog for PR #${{ github.event.number }} ${{ github.sha }}"'
 
       - name: Get version ID

.github/workflows/import-design-tokens.yml

@@ -10,6 +10,12 @@ jobs:
   import-design-tokens:
     runs-on: ubuntu-latest
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - uses: actions/checkout@v3
 
       - name: Checkout mistica-design repo with the tokens

.github/workflows/release.yml

@@ -6,6 +6,12 @@ jobs:
   promote:
     runs-on: ubuntu-latest
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Checkout repo
         uses: actions/checkout@v2
 

.github/workflows/snapshot.yml

@@ -9,6 +9,12 @@ jobs:
   snapshot:
     runs-on: ubuntu-latest
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Checkout repo
         uses: actions/checkout@v2
 

.github/workflows/tests.yml

@@ -8,19 +8,23 @@ concurrency:
 
 jobs:
   tests:
-    runs-on: self-hosted-novum
+    runs-on: ubuntu-latest
     steps:
-    - name: Checkout repo
-      uses: actions/checkout@v2
-
-    - name: "Build Android project"
-      uses: docker://docker.tuenti.io/android/novum_android_api31:2
-      with:
-        args: 'bash ./gradlew clean check assemble'
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
 
-    - name: Upload Lint results
-      uses: github/codeql-action/upload-sarif@v2
-      if: success() || failure()
-      with:
-        sarif_file: app/build/reports/lint-results-debug.sarif
-        category: lint
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: "Build Android project"
+        run: 'bash ./gradlew clean check assemble'
+
+      - name: Upload Lint results
+        uses: github/codeql-action/upload-sarif@v2
+        if: success() || failure()
+        with:
+          sarif_file: app/build/reports/lint-results-debug.sarif
+          category: lint

.github/workflows/update_screenshot_baseline.yml

@@ -6,6 +6,12 @@ jobs:
   screenshots_baseline:
     runs-on: ubuntu-latest
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Checkout repo
         uses: actions/checkout@v2
 

app/build.gradle

@@ -8,12 +8,13 @@ def appCenterProjects = new Properties()
 file("appcenter_projects.properties").withInputStream { appCenterProjects.load(it) }
 
 android {
-    compileSdkVersion 33
+    compileSdk target_sdk_version
+    namespace "com.telefonica.mistica.app"
 
     defaultConfig {
         applicationId "com.telefonica.mistica.app"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion min_sdk_version
+        targetSdkVersion target_sdk_version
         versionCode versionCodeDate()
         versionName "1.0.0"
 
@@ -51,6 +52,18 @@ android {
         }
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 static def versionCodeDate() {

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.mistica.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

build.gradle

@@ -1,13 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_ui_version = "1.3.3"
-        compose_core_version = '1.3.1'
-        compose_compiler_version = '1.4.7'
-        kotlin_version = "1.8.21"
+        min_sdk_version = 21
+        target_sdk_version = 34
+        compose_ui_version = "1.5.4"
+        compose_compiler_version = '1.5.7'
+        kotlin_version = "1.9.21"
         androidx_appcompat_version = "1.6.0"
         androidx_activity_compose_version = "1.6.0"
-        accompanist_version = "0.30.1"
+        accompanist_version = "0.32.0"
         coil_version = '2.2.2'
         constraintComposeVersion = '1.0.1'
         roborazzi_version = "1.7.0"
@@ -19,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "gradle.plugin.com.betomorrow.gradle:appcenter-plugin:2.0.3"
     }

catalog/build.gradle

@@ -6,19 +6,19 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdk target_sdk_version
+    namespace = "com.telefonica.mistica.catalog"
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion min_sdk_version
+        targetSdkVersion target_sdk_version
 
         buildConfigField "String", "APPCENTER_KEY", "\"" + System.env.APPCENTER_KEY + "\""
         vectorDrawables {
             useSupportLibrary true
         }
     }
 
-
     lintOptions {
         warningsAsErrors true
     }
@@ -27,15 +27,25 @@ android {
     }
     buildFeatures {
         compose true
+        buildConfig true
     }
     composeOptions {
         kotlinCompilerExtensionVersion compose_compiler_version
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 task sourceJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier = "sources"
 }
 
 dependencies {
@@ -45,7 +55,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout-compose:$constraintComposeVersion"
     implementation 'androidx.activity:activity-compose:1.4.0'
     implementation "androidx.navigation:navigation-compose:2.5.3"
-    implementation "androidx.compose.material:material:$compose_core_version"
+    implementation "androidx.compose.material:material:$compose_ui_version"
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
 

catalog/src/main/AndroidManifest.xml

@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="com.telefonica.mistica.catalog"
-		>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<application>
 		<activity

gradle.properties

@@ -17,8 +17,4 @@ android.useAndroidX=true
 
 kapt.incremental.apt=true
 
-# This will be default on AGP 8.0
-android.r8.failOnMissingClasses=true
-
-###### Project settings ######
-android.databinding.incremental=true
+android.nonTransitiveRClass = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri May 19 13:07:06 CEST 2023
+#Tue Jan 09 09:55:03 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library-test-utils/build.gradle

@@ -0,0 +1,43 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'com.telefonica.mistica'
+    compileSdk target_sdk_version
+
+    defaultConfig {
+        minSdk min_sdk_version
+        targetSdk target_sdk_version
+
+        vectorDrawables {
+            useSupportLibrary true
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_compiler_version
+    }
+}
+
+dependencies {
+    implementation project(':library')
+
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+}

library/src/test/AndroidManifest.xml → library-test-utils/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="com.telefonica.mistica"
-		>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	<uses-permission android:name="android.permission.VIBRATE" />
-
 	<application>
 		<activity
 				android:name=".DummyActivity"