From b497b0edc6ba11da4fadea74569f55a04ebaad7c Mon Sep 17 00:00:00 2001
From: Kris Price <kristoffer.k.price@gmail.com>
Date: Sun, 16 Apr 2023 19:48:19 -0600
Subject: [PATCH] upgrade android sdk to 33

---
 app/build.gradle                              | 9 +++++----
 app/src/main/AndroidManifest.xml              | 3 +--
 build.gradle                                  | 2 +-
 gradle.properties                             | 3 +++
 gradle/wrapper/gradle-wrapper.properties      | 2 +-
 javaOpenCV/build.gradle                       | 4 ++++
 javaOpenCV/src/main/AndroidManifest.xml       | 3 +--
 openCVLibrary344/build.gradle                 | 4 ++++
 openCVLibrary344/src/main/AndroidManifest.xml | 3 +--
 9 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9d184c82..3ee8b2e3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdk 33
     buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "com.onrpiv.uploadmedia"
         minSdkVersion 25
-        targetSdkVersion 31
-        versionCode 103
-        versionName "1.0.3"
+        targetSdkVersion 33
+        versionCode 104
+        versionName "1.0.4"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
@@ -32,6 +32,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'com.onrpiv.uploadmedia'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 60f731b2..a8f7769f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.onrpiv.uploadmedia">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/build.gradle b/build.gradle
index 5a30fc16..5a080efd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         maven {url "https://maven.google.com"}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.0.0'
 
         // Firebase Crashlytics
         classpath 'com.google.gms:google-services:4.3.13'
diff --git a/gradle.properties b/gradle.properties
index 4118181d..c259a6c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,6 +11,9 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Thu Mar 04 13:53:04 MST 2021
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 46541092..c98f28cd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
diff --git a/javaOpenCV/build.gradle b/javaOpenCV/build.gradle
index 778a0519..6f03250c 100644
--- a/javaOpenCV/build.gradle
+++ b/javaOpenCV/build.gradle
@@ -22,4 +22,8 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'org.opencv'
+    buildFeatures {
+        aidl true
+    }
 }
diff --git a/javaOpenCV/src/main/AndroidManifest.xml b/javaOpenCV/src/main/AndroidManifest.xml
index dd952945..f69b9107 100644
--- a/javaOpenCV/src/main/AndroidManifest.xml
+++ b/javaOpenCV/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv"
-      android:versionCode="4110"
+    android:versionCode="4110"
       android:versionName="4.1.1">
 
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/openCVLibrary344/build.gradle b/openCVLibrary344/build.gradle
index 1cb53ad3..fd4555ae 100644
--- a/openCVLibrary344/build.gradle
+++ b/openCVLibrary344/build.gradle
@@ -23,4 +23,8 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'org.opencv'
+    buildFeatures {
+        aidl true
+    }
 }
diff --git a/openCVLibrary344/src/main/AndroidManifest.xml b/openCVLibrary344/src/main/AndroidManifest.xml
index 92b1e907..1eee631e 100644
--- a/openCVLibrary344/src/main/AndroidManifest.xml
+++ b/openCVLibrary344/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv"
-      android:versionCode="3440"
+    android:versionCode="3440"
       android:versionName="3.4.4"
       android:largeHeap="true">