Merge pull request #80 from googlesamples/upgrade

Upgrade to AGP 8.x

Author: tnorbye

.github/workflows/basic.yml

@@ -10,9 +10,15 @@ jobs:
       - uses: actions/checkout@v2
       - name: Validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
+      # AGP 8.2 requires 34.0.0-rc3 - see https://issuetracker.google.com/issues/236167971#comment36
+      # and https://github.com/actions/runner-images/issues/7506#issuecomment-1533097084
+      # TODO: Remove when AGP updates Build Tools to 34.0.0 and pre-installed in the runner
+      #- name: Install Android Build Tools 34.0.0-rc3
+      #  run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;34.0.0-rc3"
+      #  shell: bash
       - name: Build with Gradle
         run: ./gradlew build test

app/build.gradle

@@ -4,30 +4,30 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.android.example.lint_usage"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
-    lintOptions {
+    namespace 'com.android.example'
+    lint {
         checkDependencies true
-        textReport true
-
         // Produce report for CI:
         // https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning
-        sarifOutput file("../lint-results.sarif")
+        sarifOutput file('../lint-results.sarif')
+        textReport true
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Not a real app, just a skeleton to show code depending
 	 on library with lint checks producing errors in the report -->

build.gradle

@@ -1,16 +1,12 @@
 buildscript {
     ext {
-        kotlinVersion = '1.6.21'
-        // Current release: Chipmunk / AGP 7.2
-        gradlePluginVersion = '7.2.0'
-        lintVersion = '30.2.0'
-        // lintVersion = '30.2.0-rc02'
-        // Upcoming lint target: Dolphin / AGP 7.3
-        // gradlePluginVersion = '7.3.0-beta01'
-        // lintVersion = '30.3.0-beta01'
-        // Upcoming lint target: Electric Eel / AGP 7.4
-        // gradlePluginVersion = '7.4.0-alpha02'
-        // lintVersion = '30.4.0-alpha02'
+        kotlinVersion = '1.8.20'
+        // Current release: Flamingo / AGP 8.0
+        gradlePluginVersion = '8.0.2'
+        lintVersion = '31.0.2'
+        // Current preview release: Hedgehog
+        //gradlePluginVersion = '8.2.0-alpha07'
+        //lintVersion = '31.2.0-alpha07'
     }
 
     repositories {

checks/build.gradle

@@ -22,5 +22,5 @@ dependencies {
     testImplementation "com.android.tools.lint:lint-tests:$lintVersion"
 }
 
-sourceCompatibility = "1.8"
-targetCompatibility = "1.8"
+sourceCompatibility = "17"
+targetCompatibility = "17"

gradle.properties

@@ -9,6 +9,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle

@@ -1,16 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 32
+        targetSdkVersion 33
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
-    lintOptions {
+    namespace 'com.example.lint.library'
+    lint {
         checkDependencies true
     }
 }

library/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest package="com.example.lint.library">
+<manifest>
 
 </manifest>