From 588de655d52c2c78139343c69cce296c9d82ba27 Mon Sep 17 00:00:00 2001
From: jarnedemeulemeester <jarnedemeulemeester@gmail.com>
Date: Thu, 29 Jul 2021 14:11:46 +0200
Subject: [PATCH] Update to gradle 7.0.0 and build tools 31.0.0

---
 .gitignore                               |  1 +
 .idea/gradle.xml                         | 20 --------------------
 .idea/misc.xml                           |  9 +++++++++
 .idea/runConfigurations.xml              | 10 ----------
 app/build.gradle                         |  7 +++----
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 7 files changed, 15 insertions(+), 36 deletions(-)
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.gitignore b/.gitignore
index 7b2d9ce7..19ea9173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/discord.xml
+/.idea/gradle.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 5cd135a0..00000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6199cc2a..b696582b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/fragment_home.xml" value="0.1736111111111111" />
+        <entry key="app/src/main/res/layout/fragment_library.xml" value="0.1736111111111111" />
+        <entry key="app/src/main/res/layout/fragment_season.xml" value="0.20471014492753623" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea5..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a66d9c0e..cc493306 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,7 @@ plugins {
 
 android {
     compileSdkVersion 31
-    // Upgrade buildToolsVersion to 31.0.0 when Android Studio Arctic Fox is available
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "dev.jdtech.jellyfin"
@@ -53,7 +52,7 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
 
     // Material
     implementation 'com.google.android.material:material:1.4.0'
@@ -95,7 +94,7 @@ dependencies {
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
 
     // ExoPlayer
-    def exoplayer_version = "2.14.1"
+    def exoplayer_version = "2.14.2"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
     implementation files('libs/extension-ffmpeg-release.aar')
diff --git a/build.gradle b/build.gradle
index 1493001e..93c21d17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 383275ed..36a2a9a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat May 29 10:38:39 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME