Update Gradle and Android Plugins (#1244)

* Update Gradle and Android Plugins

We can now use a modern Java to build the native libraries.

* Just install Java 21

* Update setup-environment.yml

* Revert "Update setup-environment.yml"

This reverts commit a76a334.

* Revert "Just install Java 21"

This reverts commit fa09d98.

* Try this

* ANDROID_HOME

* logging

* Fix this

* Update BUILDING.md

* revert versions

Author: mattleibow

.github/workflows/copilot-setup-steps.yml

@@ -18,11 +18,11 @@ jobs:
     - name: Install Android workload
       run: dotnet workload install android
 
-    - name: Setup OpenJDK 11
+    - name: Setup OpenJDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'microsoft'
-        java-version: '11'
+        java-version: '21'
 
     - name: Restore dotnet tools
       run: dotnet tool restore
@@ -58,6 +58,7 @@ jobs:
         echo ".NET Version: $(dotnet --version)"
         echo "Java Version: $(java -version 2>&1 | head -1)"
         echo "Android SDK Root: $ANDROID_SDK_ROOT"
+        echo "Android Home: $ANDROID_HOME"
         echo "Java Home: $JAVA_HOME"
         echo "=== Installed Workloads ==="
         dotnet workload list

BUILDING.md

@@ -12,10 +12,9 @@ Before building the libraries and samples in this repository, you will need to i
     dotnet tool install -g cake.tool
     ```
 
-  * [Microsoft OpenJDK *11*](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-11)
-    (JDK-17 is not currently supported).
+  * [Microsoft OpenJDK *21*](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-21)
 
-    The `javac` from your JDK 11 installation must be *first* in `$PATH`/`%PATH%`.
+    The `javac` from your JDK 21 installation must be *first* in `$PATH`/`%PATH%`.
 
   * The [Android SDK](https://developer.android.com/studio), and the
     `ANDROID_SDK_ROOT` environment variable set to the Android SDK location.

build/cake/build-and-package.cake

@@ -92,6 +92,8 @@ void BuildGradleProject (string root, string outputDir, bool moveFile)
 void RunGradle (DirectoryPath root, string target)
 {
     root = MakeAbsolute (root);
+
+    Information($"Running Gradle {target} in {root}");
 
     var proc = IsRunningOnWindows ()
         ? root.CombineWithFilePath ("gradlew.bat").FullPath
@@ -102,6 +104,8 @@ void RunGradle (DirectoryPath root, string target)
 
     args += $" {target} -p {root}";
 
+    Information($"Running {proc} {args}");
+
     var exitCode = StartProcess (proc, args);
 
     if (exitCode != 0)

build/ci/build-and-test.yml

@@ -8,6 +8,7 @@ parameters:
 
 steps:
   - pwsh: |
+      Get-Content $PSCommandPath
       dotnet cake build.cake `
         --target=ci-build `
         --configuration="$(configuration)" `
@@ -21,12 +22,14 @@ steps:
       RepositoryType: "git"
 
   - pwsh: |
+      Get-Content $PSCommandPath
       dotnet cake validation.cake `
         --namespaces="${{ join(',', parameters.validPackagePrefixes) }}" `
         --verbosity="$(verbosity)"
     displayName: 'Run NuGet package validation'
     
   - pwsh: |
+      Get-Content $PSCommandPath
       dotnet cake nuget-diff.cake `
         --artifacts="${{ parameters.artifactsPath }}" `
         --output="${{ parameters.artifactsPath }}/api-diff" `
@@ -35,10 +38,13 @@ steps:
     displayName: 'Generate API diff'
     condition: eq(variables['Agent.OS'], 'Windows_NT')
 
-  - pwsh: dotnet cake utilities.cake -t=verify-namespace-file
+  - pwsh: |
+      Get-Content $PSCommandPath
+      dotnet cake utilities.cake -t=verify-namespace-file
     displayName: Verify published namespaces
 
   - pwsh: |
+      Get-Content $PSCommandPath
       dotnet cake build.cake `
         --target=ci-samples `
         --configuration="$(configuration)" `

build/ci/build.yml

@@ -51,6 +51,7 @@ jobs:
 
     # Copy SignList.xml to output
     - pwsh: |
+        Get-Content $PSCommandPath
         $srcExists = (Test-Path "${{ parameters.signListPath }}")
         $dstExists = (Test-Path "${{ parameters.artifactsPath }}\SignList.xml")
         if ($srcExists -and !$dstExists) {

build/ci/job-extended-tests.yml

@@ -36,14 +36,14 @@ jobs:
       arguments: -c $(configuration)
 
   # Figure out which tests this slice is running
-  - pwsh: >-
-      dotnet dotnet-test-slicer 
-      slice
-      --test-assembly="${{ parameters.testAssembly }}"
-      --test-filter="${{ parameters.testFilter }}"
-      --slice-number=$(System.JobPositionInPhase)
-      --total-slices=$(System.TotalJobsInPhase)
-      --outfile="${{ parameters.testAssembly }}.runsettings"
+  - pwsh: |
+      Get-Content $PSCommandPath
+      dotnet dotnet-test-slicer slice `
+        --test-assembly="${{ parameters.testAssembly }}" `
+        --test-filter="${{ parameters.testFilter }}" `
+        --slice-number=$(System.JobPositionInPhase) `
+        --total-slices=$(System.TotalJobsInPhase) `
+        --outfile="${{ parameters.testAssembly }}.runsettings"
     displayName: Slice unit tests
     failOnStderr: true      
     

build/ci/setup-environment.yml

@@ -1,7 +1,7 @@
 parameters:
   installAndroidDependencies: false
   androidSdkRoot: $(Agent.TempDirectory)/android-sdk
-  javaSdkRoot: $(Agent.ToolsDirectory)\jdk11
+  javaSdkRoot: $(Agent.ToolsDirectory)\jdk21
 
 steps:
   # before the build starts, make sure the tooling is as expected. Clear the cache on shared agents
@@ -46,18 +46,18 @@ steps:
 
   - bash: |
       if [[ "$(Agent.Name)" == *"Azure Pipelines"* ]]; then
-          echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+          echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_21_X64)"
       else
-          echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home"
+          echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home"
       fi
-    displayName: Use Java 11 SDK (Mac)
+    displayName: Use Java 21 SDK (Mac)
     condition: eq( variables['Agent.OS'], 'Darwin' )
 
   - task: JavaToolInstaller@0
-    displayName: Use Java 11 SDK (Windows)
+    displayName: Use Java 21 SDK (Windows)
     condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true))
     inputs:
-      versionSpec: '11'
+      versionSpec: '21'
       jdkArchitectureOption: 'x64'
       jdkSourceOption: 'PreInstalled'
 
@@ -86,26 +86,27 @@ steps:
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory]${{ parameters.androidSdkRoot }}"
       Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT]${{ parameters.androidSdkRoot }}"
-    displayName: Set ANDROID_SDK_ROOT to ${{ parameters.androidSdkRoot }}
+      Write-Host "##vso[task.setvariable variable=ANDROID_HOME]${{ parameters.androidSdkRoot }}"
+    displayName: Set ANDROID_SDK_ROOT and ANDROID_HOME to ${{ parameters.androidSdkRoot }}
 
   - ${{ if eq(parameters.installAndroidDependencies, true) }}:
     - pwsh: |
-        $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-windows-x64.zip"
+        $url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.8-windows-x64.zip"
         if ($IsMacOS) {
-            $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-macos-x64.tar.gz"
+            $url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.8-macos-x64.tar.gz"
         }
         $fileName = [System.IO.Path]::GetFileName($url)
         Invoke-WebRequest -Uri $url -OutFile $fileName
-        Write-Host "##vso[task.setvariable variable=JDK_11_FILE_PATH]$(Build.StagingDirectory)/$fileName"
-      displayName: Download Java 11 SDK
+        Write-Host "##vso[task.setvariable variable=JDK_21_FILE_PATH]$(Build.StagingDirectory)/$fileName"
+      displayName: Download Java 21 SDK
       workingDirectory: $(Build.StagingDirectory)
 
     - task: JavaToolInstaller@0
-      displayName: Use Java 11 SDK
+      displayName: Use Java 21 SDK
       inputs:
-        versionSpec: '11'
+        versionSpec: '21'
         jdkArchitectureOption: 'x64'
         jdkSourceOption: LocalDirectory
-        jdkFile: $(JDK_11_FILE_PATH)
+        jdkFile: $(JDK_21_FILE_PATH)
         jdkDestinationDirectory: ${{ parameters.javaSdkRoot }}
         cleanDestinationDirectory: true

published-namespaces.txt

@@ -1367,8 +1367,6 @@ Xamarin.Google.Android.DataTransport.Runtime.Time
 Xamarin.Google.Android.DataTransport.Runtime.Util
 Xamarin.Google.Android.Finsky.ExternalReferrer
 Xamarin.Google.Android.Odml.Image
-Xamarin.Google.Android.Play.Asset.Delivery
-Xamarin.Google.Android.Play.Core
 Xamarin.Google.Android.Play.Core.AppUpdate
 Xamarin.Google.Android.Play.Core.AppUpdate.Install
 Xamarin.Google.Android.Play.Core.AppUpdate.Install.Model
@@ -1391,7 +1389,6 @@ Xamarin.Google.Android.Play.Core.SplitInstall
 Xamarin.Google.Android.Play.Core.SplitInstall.Model
 Xamarin.Google.Android.Play.Core.SplitInstall.Testing
 Xamarin.Google.Android.Play.Core.Tasks
-Xamarin.Google.Android.Play.Feature.Delivery
 Xamarin.Google.Android.Recaptcha
 Xamarin.Google.Crypto.Tink
 Xamarin.Google.Crypto.Tink.Aead

source/com.google.android.material/material.extensions/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    namespace 'com.xamarin.google.android.material.extensions.app'
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.xamarin.google.android.material.extensions.app"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdk 21
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -20,7 +20,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

source/com.google.android.material/material.extensions/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.xamarin.google.android.material.extensions.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -9,7 +8,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />