[android] Update gradle.properties (#30543)

* Update gradle.properties

* [vs] Workaround for dev18

* Revert "Update gradle.properties"

This reverts commit 49e7f07.

* [android] Update build gradle for api 35

* Try again

* Try update other properties

* Remove deprecated lib

* [android] Revert some changes

* [android] Try fix android gradle namespace

* Remove from manifest the package name

Author: rmarinho

eng/cake/dotnet.cake

@@ -684,10 +684,15 @@ Dictionary<string, string> GetDotNetEnvironmentVariables()
 void SetDotNetEnvironmentVariables(string dotnetDir = null)
 {
     var dotnet = dotnetDir ?? MakeAbsolute(Directory("./.dotnet/")).ToString();
-    
+    var dotnetHostPath = IsRunningOnWindows() ? $"{dotnet}/dotnet.exe" : $"{dotnet}/dotnet";
     SetEnvironmentVariable("VSDebugger_ValidateDotnetDebugLibSignatures", "0");
     SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
     SetEnvironmentVariable("DOTNET_ROOT", dotnet);
+    if (IsRunningOnWindows())
+    { 
+        //workaround for dev18 
+        SetEnvironmentVariable("DOTNET_HOST_PATH", dotnetHostPath);
+    }
     SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
     SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
     SetEnvironmentVariable("DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT", "true");

src/Core/AndroidNative/build.gradle

@@ -5,10 +5,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath "com.android.tools.build:gradle:8.11.1"
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

src/Core/AndroidNative/gradle.properties

@@ -16,4 +16,9 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true
+# Use R8 in full mode
+android.enableR8.fullMode=true
+# Enable namespacing of each library's R class so that its R class includes only the resources declared in the library itself
+# and none from the library's dependencies
+android.nonTransitiveRClass=true

src/Core/AndroidNative/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/Core/AndroidNative/maui/build.gradle

@@ -3,11 +3,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
+    namespace "microsoft.maui"
 
     defaultConfig {
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName '1.0'
         setProperty('archivesBaseName', 'maui')

src/Core/AndroidNative/maui/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.maui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java

@@ -398,7 +398,8 @@ public static void loadImageFromFont(Context context, @ColorInt int color, Strin
     }
 
     public static ColorStateList getColorStateListForToolbarStyleableAttribute(Context context, int resId, int index) {
-        TintTypedArray styledAttributes = TintTypedArray.obtainStyledAttributes(context, null, R.styleable.Toolbar, resId, 0);
+        // Use the appcompat styleable resource ID instead
+        TintTypedArray styledAttributes = TintTypedArray.obtainStyledAttributes(context, null, androidx.appcompat.R.styleable.Toolbar, resId, 0);
         try {
             return styledAttributes.getColorStateList(index);
         } finally {

src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/glide/MauiCustomViewTarget.java

@@ -14,7 +14,7 @@
 import com.bumptech.glide.request.target.CustomViewTarget;
 import com.bumptech.glide.request.transition.Transition;
 
-import com.microsoft.maui.R;
+import microsoft.maui.R;
 import com.microsoft.maui.ImageLoaderCallback;
 import com.microsoft.maui.PlatformLogger;
 import com.microsoft.maui.glide.MauiTarget;

src/Core/AndroidNative/settings.gradle

@@ -1,10 +1,19 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
     repositories {
         google()
         mavenCentral()
     }
 }
+
 // NOTE: we can't use '.NET MAUI'
 rootProject.name = "DOTNET MAUI"
 include ':maui'