From 82d5b9b05f63127b7a21dd27046b98b6c75230b1 Mon Sep 17 00:00:00 2001
From: ThibaultBee <ThibaultBee@users.noreply.github.com>
Date: Thu, 8 Feb 2024 13:52:06 +0000
Subject: [PATCH] chore(java): upgrade to gradle 8.2.2

---
 build.gradle                             | 31 +++++++++++++++---------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 src/main/AndroidManifest.xml             |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index e68d474..bcabd82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,13 +29,16 @@ if(hasProperty('target') && target == 'android') {
     apply from: 'maven-push.gradle'
 
     android {
-        compileSdkVersion 33
-        buildToolsVersion '30.0.3'
+        compileSdk 34
+
         defaultConfig {
-            minSdkVersion 21
-            targetSdkVersion 33
+            minSdk 21
+            targetSdk 34
+
             multiDexEnabled true
 
+            consumerProguardFiles 'consumer-rules.pro'
+
             testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
             testInstrumentationRunnerArgument("runnerBuilder", "de.mannodermaus.junit5.AndroidJUnit5Builder")
             testInstrumentationRunnerArgument("environmentVariables", "INTEGRATION_TESTS_API_KEY=${System.getenv("INTEGRATION_TESTS_API_KEY")}")
@@ -45,6 +48,12 @@ if(hasProperty('target') && target == 'android') {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
         }
+
+        kotlinOptions {
+            jvmTarget = '1.8'
+        }
+
+        namespace "video.api.client.api"
     }
 
 } else {
@@ -79,15 +88,15 @@ if(hasProperty('target') && target == 'android') {
 dependencies {
     implementation 'io.swagger:swagger-annotations:1.5.24'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
-    api 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
-    implementation 'com.google.code.gson:gson:2.8.9'
-    implementation 'io.gsonfire:gson-fire:1.8.4'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.1'
+    api 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'io.gsonfire:gson-fire:1.9.0'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.12.4'
+    testImplementation 'org.mockito:mockito-core:5.7.0'
     testImplementation 'org.assertj:assertj-core:3.19.0'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c68..15de902 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 482b3a9..73c861c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="video.api.client.api" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />