Merge pull request #1051 from wordpress-mobile/build/upgrade-gradle-to-8.1.1-and-agp-to-8.0.2

oguzkocer · web-flow · commit f29186e0c3f4 · 2023-07-28T16:24:12.000-04:00
[Build] Upgrade Gradle to 8.2.1 and AGP to 8.1.0
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+17.0
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,6 +4,8 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec.demo"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
@@ -27,9 +29,13 @@ android {
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
 
-    lintOptions {
+    lint {
         disable 'GradleCompatible'
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,13 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.wordpress.aztec.demo">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required for downloading images -->
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- Required for adding media and requested at runtime -->
-    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA"
+        tools:ignore="PermissionImpliesUnsupportedChromeOsHardware" />
     <!-- Allows for storing and retrieving screenshots, photos, videos and audios -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -18,6 +19,8 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application
         android:label="@string/app_name"
         android:allowBackup="true"
diff --git a/aztec/build.gradle b/aztec/build.gradle
@@ -5,12 +5,13 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionName "1.0"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -81,7 +82,6 @@ project.afterEvaluate {
 
                 groupId "org.wordpress"
                 artifactId "aztec"
-                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
diff --git a/aztec/src/main/AndroidManifest.xml b/aztec/src/main/AndroidManifest.xml
diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle
@@ -5,14 +5,13 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec.glideloader"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-
     }
 
     buildTypes {
@@ -36,7 +35,6 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "glide-loader"
-                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
diff --git a/glide-loader/src/main/AndroidManifest.xml b/glide-loader/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.wordpress.aztec.glideloader">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/media-placeholders/build.gradle b/media-placeholders/build.gradle
@@ -5,12 +5,13 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec.placeholders"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionName "1.0"
     }
 
     buildTypes {
@@ -50,7 +51,6 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "media-placeholders"
-                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
diff --git a/media-placeholders/src/main/AndroidManifest.xml b/media-placeholders/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="org.wordpress.aztec.placeholders">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle
@@ -5,13 +5,13 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec.picassoloader"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
     }
 
     buildTypes {
@@ -39,7 +39,6 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "picasso-loader"
-                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
diff --git a/picasso-loader/src/main/AndroidManifest.xml b/picasso-loader/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.wordpress.aztec.picassoloader">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
     gradle.ext.kotlinVersion = '1.6.10'
-    gradle.ext.agpVersion = '7.2.1'
-    gradle.ext.automatticPublishToS3Version = '0.7.0'
+    gradle.ext.agpVersion = '8.1.0'
+    gradle.ext.automatticPublishToS3Version = '0.8.0'
 
     plugins {
         id "com.android.library" version gradle.ext.agpVersion
diff --git a/wordpress-comments/build.gradle b/wordpress-comments/build.gradle
@@ -5,12 +5,13 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec.plugins.wpcomments"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionName "1.0"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -53,7 +54,6 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "wordpress-comments"
-                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
diff --git a/wordpress-comments/src/main/AndroidManifest.xml b/wordpress-comments/src/main/AndroidManifest.xml
diff --git a/wordpress-shortcodes/build.gradle b/wordpress-shortcodes/build.gradle
@@ -5,12 +5,13 @@ plugins {
 }
 
 android {
+    namespace "org.wordpress.aztec.plugins.shortcodes"
+
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionName "1.0"
     }
 
     buildTypes {
@@ -50,7 +51,6 @@ project.afterEvaluate {
 
                 groupId "org.wordpress.aztec"
                 artifactId "wordpress-shortcodes"
-                artifact tasks.named("androidSourcesJar")
                 // version is set by 'publish-to-s3' plugin
             }
         }
diff --git a/wordpress-shortcodes/src/main/AndroidManifest.xml b/wordpress-shortcodes/src/main/AndroidManifest.xml

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
	`7`	`+ namespace "org.wordpress.aztec.demo"`
	`8`	`+`
`7`	`9`	`compileSdkVersion rootProject.compileSdkVersion`
`8`	`10`
`9`	`11`	`defaultConfig {`
`@@ -27,9 +29,13 @@ android {`
`27`	`29`	`androidTest.java.srcDirs += 'src/androidTest/kotlin'`
`28`	`30`	`}`
`29`	`31`
`30`		`- lintOptions {`
	`32`	`+ lint {`
`31`	`33`	`disable 'GradleCompatible'`
`32`	`34`	`}`
	`35`	`+`
	`36`	`+ buildFeatures {`
	`37`	`+ buildConfig true`
	`38`	`+ }`
`33`	`39`	`}`
`34`	`40`
`35`	`41`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,13 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace "org.wordpress.aztec"`
	`9`	`+`
`8`	`10`	`compileSdkVersion rootProject.compileSdkVersion`
`9`	`11`
`10`	`12`	`defaultConfig {`
`11`	`13`	`minSdkVersion rootProject.minSdkVersion`
`12`	`14`	`targetSdkVersion rootProject.targetSdkVersion`
`13`		`- versionName "1.0"`
`14`	`15`	`vectorDrawables.useSupportLibrary = true`
`15`	`16`	`}`
`16`	`17`
`@@ -81,7 +82,6 @@ project.afterEvaluate {`
`81`	`82`
`82`	`83`	`groupId "org.wordpress"`
`83`	`84`	`artifactId "aztec"`
`84`		`- artifact tasks.named("androidSourcesJar")`
`85`	`85`	`// version is set by 'publish-to-s3' plugin`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,13 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
	`8`	`+ namespace "org.wordpress.aztec.glideloader"`
	`9`	`+`
`8`	`10`	`compileSdkVersion rootProject.compileSdkVersion`
`9`	`11`
`10`	`12`	`defaultConfig {`
`11`	`13`	`minSdkVersion rootProject.minSdkVersion`
`12`	`14`	`targetSdkVersion rootProject.targetSdkVersion`
`13`		`- versionCode 1`
`14`		`- versionName "1.0"`
`15`		`-`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`buildTypes {`
`@@ -36,7 +35,6 @@ project.afterEvaluate {`
`36`	`35`
`37`	`36`	`groupId "org.wordpress.aztec"`
`38`	`37`	`artifactId "glide-loader"`
`39`		`- artifact tasks.named("androidSourcesJar")`
`40`	`38`	`// version is set by 'publish-to-s3' plugin`
`41`	`39`	`}`
`42`	`40`	`}`