From b6d32999b9fbd272fc6977661eae7db2a2d859b7 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Thu, 22 Jun 2023 01:11:06 +0200
Subject: [PATCH] Add `JavaVersion` compatible to `icon-pack`

This now also contains Kotlin code.
---
 crypto/build.gradle    | 7 ++++---
 database/build.gradle  | 7 +++++--
 icon-pack/build.gradle | 9 +++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/crypto/build.gradle b/crypto/build.gradle
index 1ddf5a873..bba3a7eed 100644
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -23,7 +23,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
+
     externalNativeBuild {
         cmake {
             path "src/main/jni/CMakeLists.txt"
@@ -31,11 +31,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
 }
 
diff --git a/database/build.gradle b/database/build.gradle
index c1094d041..ad710fabd 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -20,13 +20,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
+
     testOptions {
         unitTests {
             includeAndroidResources = true
diff --git a/icon-pack/build.gradle b/icon-pack/build.gradle
index 5ae83a35f..5285bb64c 100644
--- a/icon-pack/build.gradle
+++ b/icon-pack/build.gradle
@@ -10,6 +10,15 @@ android {
         minSdkVersion 14
         targetSdkVersion 33
     }
+
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {