From f95dbaf0568fef35bdf1a5fc4fc7d030881a6261 Mon Sep 17 00:00:00 2001
From: theapache64 <theapache64@gmail.com>
Date: Wed, 9 Jun 2021 14:08:19 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20API=20issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.name                                                   | 1 +
 .idea/gradle.xml                                              | 1 +
 .idea/misc.xml                                                | 2 +-
 app/build.gradle                                              | 4 ++--
 .../java/com/theapache64/topcorn2/data/local/AppDatabase.kt   | 2 +-
 .../main/java/com/theapache64/topcorn2/data/remote/Movie.kt   | 2 +-
 .../theapache64/topcorn2/ui/screen/movies/MoviesViewModel.kt  | 2 +-
 build.gradle                                                  | 2 +-
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 .idea/.name

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..2fdbac2
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+topcorn2
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c2..bb80ebf 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 465bd08..891dbb1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -88,7 +88,7 @@
       <textMaps />
     </LinkMapSettings>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <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>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 3b9fc4a..640f084 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.theapache64.topcorn2"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 10002
-        versionName "1.0.0-alpha02"
+        versionCode 10003
+        versionName "1.0.0-alpha03"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/theapache64/topcorn2/data/local/AppDatabase.kt b/app/src/main/java/com/theapache64/topcorn2/data/local/AppDatabase.kt
index d0aaa3d..5223867 100644
--- a/app/src/main/java/com/theapache64/topcorn2/data/local/AppDatabase.kt
+++ b/app/src/main/java/com/theapache64/topcorn2/data/local/AppDatabase.kt
@@ -6,7 +6,7 @@ import androidx.room.TypeConverters
 import com.theapache64.topcorn2.data.local.daos.MoviesDao
 import com.theapache64.topcorn2.data.remote.Movie
 
-@Database(entities = [Movie::class], version = 2)
+@Database(entities = [Movie::class], version = 3)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun movieDao(): MoviesDao
diff --git a/app/src/main/java/com/theapache64/topcorn2/data/remote/Movie.kt b/app/src/main/java/com/theapache64/topcorn2/data/remote/Movie.kt
index c786861..8348169 100644
--- a/app/src/main/java/com/theapache64/topcorn2/data/remote/Movie.kt
+++ b/app/src/main/java/com/theapache64/topcorn2/data/remote/Movie.kt
@@ -35,7 +35,7 @@ data class Movie(
     @Json(name = "rating")
     val rating: Float, // 8.2
     @Json(name = "year")
-    val year: Int
+    val year: Int?
 ) : Serializable {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "id")
diff --git a/app/src/main/java/com/theapache64/topcorn2/ui/screen/movies/MoviesViewModel.kt b/app/src/main/java/com/theapache64/topcorn2/ui/screen/movies/MoviesViewModel.kt
index 44861d3..e725f96 100644
--- a/app/src/main/java/com/theapache64/topcorn2/ui/screen/movies/MoviesViewModel.kt
+++ b/app/src/main/java/com/theapache64/topcorn2/ui/screen/movies/MoviesViewModel.kt
@@ -55,7 +55,7 @@ class MoviesViewModel @ViewModelInject constructor(
                     .sortedByDescending {
                         when (sortOrder) {
                             SORT_ORDER_RATING -> it.rating
-                            SORT_ORDER_YEAR -> it.year.toFloat()
+                            SORT_ORDER_YEAR -> it.year?.toFloat()
                             else -> {
                                 throw IllegalArgumentException("TSH : sort order '$sortOrder' not managed")
                             }
diff --git a/build.gradle b/build.gradle
index c11456e..79346c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha04'
+        classpath 'com.android.tools.build:gradle:7.0.0-beta03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c1a204f..c0a3a76 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jan 03 20:12:08 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME