From 3a52071f50abb3b5d623f6004237c422f05ddf1f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 11 Jan 2024 10:52:54 +0100
Subject: [PATCH] Update AGP to 8.4.2

---
 OpenKeychain/build.gradle                   | 12 ++----------
 OpenKeychain/src/google/AndroidManifest.xml |  3 +--
 OpenKeychain/src/main/AndroidManifest.xml   |  1 -
 build.gradle                                |  2 +-
 extern/MaterialChipsInput/build.gradle      |  1 +
 gradle.properties                           |  5 ++++-
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 nfcsweetspot/build.gradle                   |  1 +
 nfcsweetspot/src/main/AndroidManifest.xml   |  2 +-
 sshauthentication-api/build.gradle          |  5 +++++
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 433f770a3..1e5dfde18 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -108,8 +108,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     testOptions.unitTests.all {
@@ -214,14 +214,6 @@ android {
         htmlOutput file('lint-report.html')
     }
 
-    dexOptions {
-        preDexLibraries true
-        // dexInProcess requires much RAM, which is not available on all dev systems
-        dexInProcess false
-        jumboMode true
-        javaMaxHeapSize "2g"
-    }
-
     buildFeatures {
         dataBinding true
     }
diff --git a/OpenKeychain/src/google/AndroidManifest.xml b/OpenKeychain/src/google/AndroidManifest.xml
index 21319668c..03729232e 100644
--- a/OpenKeychain/src/google/AndroidManifest.xml
+++ b/OpenKeychain/src/google/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.sufficientlysecure.keychain" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="com.android.vending.BILLING" />
 
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 23a425784..e9e9a6b8c 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/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="org.sufficientlysecure.keychain"
     android:installLocation="auto">
 
     <!--
diff --git a/build.gradle b/build.gradle
index 0bc2fbd73..4bccc4e6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
     dependencies {
         // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         // classpath 'com.squareup.sqldelight:gradle-plugin:0.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.squareup.sqldelight:gradle-plugin:1.5.4'
diff --git a/extern/MaterialChipsInput/build.gradle b/extern/MaterialChipsInput/build.gradle
index 657357337..047cbcaf8 100644
--- a/extern/MaterialChipsInput/build.gradle
+++ b/extern/MaterialChipsInput/build.gradle
@@ -8,6 +8,7 @@ android {
         targetSdkVersion 28
         versionCode 114
         versionName "1.1.4"
+        namespace 'org.sufficientlysecure.materialchips'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/gradle.properties b/gradle.properties
index dbb049958..e46863db5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,7 @@
 android.enableJetifier=true
 android.useAndroidX=true
 android.jetifier.ignorelist=bcprov-jdk15on
-org.gradle.jvmargs=-Xms128m -Xmx4096m -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
+org.gradle.jvmargs=-Xms128m -Xmx4096m -XX:+CMSClassUnloadingEnabled
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f..15de90249 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/nfcsweetspot/build.gradle b/nfcsweetspot/build.gradle
index 23de1d09a..d55428cdb 100644
--- a/nfcsweetspot/build.gradle
+++ b/nfcsweetspot/build.gradle
@@ -5,6 +5,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
+        namespace 'de.cotech.sweetspot'
     }
 
     // Do not abort build if lint finds errors
diff --git a/nfcsweetspot/src/main/AndroidManifest.xml b/nfcsweetspot/src/main/AndroidManifest.xml
index 2f36697f8..568741e54 100644
--- a/nfcsweetspot/src/main/AndroidManifest.xml
+++ b/nfcsweetspot/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="de.cotech.sweetspot" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/sshauthentication-api/build.gradle b/sshauthentication-api/build.gradle
index 499cadc2f..a3b6d463a 100644
--- a/sshauthentication-api/build.gradle
+++ b/sshauthentication-api/build.gradle
@@ -18,8 +18,12 @@ android {
     lintOptions {
         abortOnError false
     }
+    buildFeatures {
+        aidl true
+    }
 }
 
+/*
 // https://developer.android.com/studio/build/maven-publish-plugin
 afterEvaluate {
     publishing {
@@ -49,3 +53,4 @@ afterEvaluate {
         }
     }
 }
+*/
\ No newline at end of file