Upgrade Gradle version to 7.5 and AGP to 7.4.2

tangrams · Jan 6, 2024 · 7a4362a · 7a4362a
1 parent bc29e4d
commit 7a4362a
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 125 deletions.
diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle
@@ -5,7 +5,7 @@ allprojects {
       jcenter()
     }
     dependencies {
-      classpath 'com.android.tools.build:gradle:7.0.3'
+      classpath 'com.android.tools.build:gradle:7.4.2'
     }
   }
 

diff --git a/platforms/android/demo/build.gradle b/platforms/android/demo/build.gradle
@@ -29,6 +29,8 @@ android {
     ignoreAssetsPattern '!*.ttf'
   }
 
+  namespace 'com.mapzen.tangram.android'
+
 }
 
 dependencies {

diff --git a/platforms/android/demo/src/main/AndroidManifest.xml b/platforms/android/demo/src/main/AndroidManifest.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.mapzen.tangram.android"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:theme="@style/Theme.AppCompat.NoActionBar">
-        <activity android:name="MainActivity"
-                  android:label="@string/app_name">
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat.NoActionBar">
+        <activity
+            android:name="MainActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.jar b/platforms/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Dec 09 00:20:45 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip