From 013cc36b5ed2cd095473805a60b159c3db5472e4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 4 May 2023 07:26:03 +0200
Subject: [PATCH] Updated to Android Studio Flamingo

---
 .idea/compiler.xml                            | 6 ------
 app/build.gradle                              | 3 +++
 app/src/main/java/eu/faircode/email/Core.java | 6 +++---
 build.gradle                                  | 2 +-
 colorpicker/build.gradle                      | 1 +
 gradle.properties                             | 3 +++
 gradle/wrapper/gradle-wrapper.properties      | 2 +-
 openpgp-api/build.gradle                      | 5 +++++
 8 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 .idea/compiler.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8a46..0000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6df232a871..0d9dd7516e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,6 +81,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     externalNativeBuild {
         cmake {
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index cbc7c51f60..4e778765f8 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -6220,7 +6220,7 @@ class Core {
                 return false;
 
             semaphore.release();
-            yield();
+            microWait();
             return true;
         }
 
@@ -6265,7 +6265,7 @@ class Core {
 
             if (!backingoff) {
                 thread.interrupt();
-                yield();
+                microWait();
             }
         }
 
@@ -6280,7 +6280,7 @@ class Core {
             serial++;
         }
 
-        private void yield() {
+        private void microWait() {
             try {
                 // Give interrupted thread some time to acquire wake lock
                 Thread.sleep(YIELD_DURATION);
diff --git a/build.gradle b/build.gradle
index 7e0b1b8910..e376e4ef14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         // https://developer.android.com/studio/releases/gradle-plugin
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         // https://github.com/bugsnag/bugsnag-android-gradle-plugin
         // https://mvnrepository.com/artifact/com.bugsnag/bugsnag-android-gradle-plugin
         classpath "com.bugsnag:bugsnag-android-gradle-plugin:7.3.1"
diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle
index e290c2b4a4..23300382a6 100644
--- a/colorpicker/build.gradle
+++ b/colorpicker/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
 android {
 	compileSdkVersion 29
 	buildToolsVersion "29.0.0"
+	namespace 'com.flask.colorpicker'
 
 	defaultConfig {
 		minSdkVersion 14
diff --git a/gradle.properties b/gradle.properties
index 8aaec8db0f..a18b3ae678 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,3 +16,6 @@ org.gradle.warning.mode=all
 
 android.useAndroidX=true
 android.enableJetifier=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f539175ad..4c2a77d501 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,5 +4,5 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #https://docs.gradle.org/current/userguide/gradle_wrapper.html
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 #distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
index 81d5769a88..7abad1dbc2 100644
--- a/openpgp-api/build.gradle
+++ b/openpgp-api/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 29
     //buildToolsVersion '27.0.3'
+    namespace 'org.openintents.openpgp'
 
     defaultConfig {
         versionCode 9
@@ -23,6 +24,10 @@ android {
         debug {
         }
     }
+
+    buildFeatures {
+        aidl true
+    }
 }
 
 //publish {