From d19c7d3548e7db667c94f9424bb0ecc846a74a55 Mon Sep 17 00:00:00 2001
From: Alexandru Gologan <alexandru.gologan@gmail.com>
Date: Sun, 21 May 2023 19:51:35 +0300
Subject: [PATCH] Build with SDK 33, Gradle 8.1.1 and Android tools 8.0.1

---
 app/AndroidManifest.xml                  | 4 +---
 app/build.gradle                         | 1 +
 build.gradle                             | 4 ++--
 config/android-common.gradle             | 3 ++-
 config/coverage.gradle                   | 4 ++--
 config/javadoc.gradle                    | 4 ++--
 config/style.gradle                      | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 library/AndroidManifest.xml              | 3 +--
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 4f183f5c..055704ae 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -11,9 +11,7 @@
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<manifest
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="net.openid.appauthdemo" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/app/build.gradle b/app/build.gradle
index 26ef381f..5a150e8f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@ apply from: '../config/android-common.gradle'
 apply from: '../config/keystore.gradle'
 
 android {
+    namespace 'net.openid.appauthdemo'
     defaultConfig {
         applicationId 'net.openid.appauthdemo'
         project.archivesBaseName = 'appauth-demoapp'
diff --git a/build.gradle b/build.gradle
index 1360114c..16eaa2a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.1'
         classpath 'org.jacoco:org.jacoco.core:0.8.7'
     }
@@ -41,7 +41,7 @@ try {
 
 project.ext {
     minSdkVersion = 16
-    compileSdkVersion = 31
+    compileSdkVersion = 33
 
     googleVersions = [
         glide                 : '4.12.0',
diff --git a/config/android-common.gradle b/config/android-common.gradle
index 08ee0043..6b42c5d5 100644
--- a/config/android-common.gradle
+++ b/config/android-common.gradle
@@ -1,4 +1,5 @@
 android {
+    namespace 'net.openid.appauth'
     compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -41,7 +42,7 @@ task jar(type: Copy, dependsOn:'bundleRelease') {
 // produces a JAR containing sources
 task sourcesJar(type: Jar, dependsOn:'generateReleaseSources') {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 tasks.withType(JavaCompile) {
diff --git a/config/coverage.gradle b/config/coverage.gradle
index 4e589e5b..413b3447 100644
--- a/config/coverage.gradle
+++ b/config/coverage.gradle
@@ -14,8 +14,8 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "testDebugUnitTest") {
     group = "Reporting"
     description = "Generate Jacoco coverage reports after running tests."
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
     // Class R is used, but usage will not be covered, so ignore this class from report
     afterEvaluate {
diff --git a/config/javadoc.gradle b/config/javadoc.gradle
index ac8d15e5..c1ae6ea9 100644
--- a/config/javadoc.gradle
+++ b/config/javadoc.gradle
@@ -9,7 +9,7 @@ dependencies {
 task androidJavadoc(type: JavaExec) {
     jvmArgs = ['--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED']
     classpath files(project.android.getBootClasspath())
-    main = 'jdk.javadoc.internal.tool.Main'
+    mainClass = 'jdk.javadoc.internal.tool.Main'
     ext.destinationDir = file("${project.buildDir}/docs/javadoc")
     args = ['-doctitle', "AppAuth for Android",
             '-use',
@@ -25,7 +25,7 @@ task androidJavadoc(type: JavaExec) {
 }
 
 task javadocJar(type: Jar, dependsOn: androidJavadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from androidJavadoc.ext.destinationDir
 }
 
diff --git a/config/style.gradle b/config/style.gradle
index e73817b6..323f0af9 100644
--- a/config/style.gradle
+++ b/config/style.gradle
@@ -10,7 +10,7 @@ task checkAllSource(type: Checkstyle) {
     afterEvaluate {
         source 'java'
         include '**/*.java'
-        classpath = files project.configurations.compile.files
+        classpath = files()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 55df8853..c017ac4b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
 #Sat Jun 13 20:20:21 CEST 2020
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index 31737510..40982c43 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -12,8 +12,7 @@
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.openid.appauth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />