From dbacad4e6c3ddd96a628802d8412f53139086454 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 7 Aug 2021 13:11:02 +0900
Subject: [PATCH] revert java version bump until android studio has better
 support

---
 app/build.gradle       | 6 +++---
 app/proguard-rules.pro | 6 +++---
 build.gradle           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7acf8496..7f9b2949 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,13 +52,13 @@ android {
     compileOptions {
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
 
     implementation 'com.github.jellyfin.jellyfin-apiclient-java:android:0.7.3'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index ff171ade..91eaad9b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,9 +1,9 @@
 -dontwarn
 -ignorewarnings
 
--keep class com.dkanada.gramophone.**.* { *; } # Keep all Gelli classes and attributes
--keepnames class **.* { *; } # Keep class and attribute names
--keepattributes SourceFile,LineNumberTable # Keep file names/line numbers
+-keep class com.dkanada.gramophone.**.* { *; }
+-keepnames class **.* { *; }
+-keepattributes SourceFile,LineNumberTable
 
 # Jellyfin API
 -keepclasseswithmembers class org.jellyfin.apiclient.model.**.* { *; }
diff --git a/build.gradle b/build.gradle
index d2ba2f45..26f16dfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21'
     }
 }