From 4b767bca54c8bba387b84b4f959d164ecc6c63f6 Mon Sep 17 00:00:00 2001
From: Hemanth S <hemanths@live.com>
Date: Tue, 6 Oct 2020 14:36:16 +0530
Subject: [PATCH] Updated Spotless

---
 .../playlists/PlaylistDetailsFragment.kt        |  3 +--
 app/src/main/res/navigation/main_graph.xml      |  4 ++--
 build.gradle                                    |  3 ++-
 spotless.gradle                                 | 17 ++---------------
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
index 6637984b..dc3e874c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
@@ -24,7 +24,7 @@ import org.koin.core.parameter.parametersOf
 
 class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail) {
     private val arguments by navArgs<PlaylistDetailsFragmentArgs>()
-    private val viewModel: PlaylistDetailsViewModel by viewModel {
+    private val viewModel by viewModel<PlaylistDetailsViewModel> {
         parametersOf(arguments.extraPlaylist)
     }
 
@@ -89,7 +89,6 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         emptyText.isVisible = playlistSongAdapter.itemCount == 0
     }
 
-
     override fun onDestroy() {
         recyclerView?.itemAnimator = null
         recyclerView?.adapter = null
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
index 80614a59..ad6626bf 100644
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@@ -15,7 +15,7 @@
             app:argType="code.name.monkey.retromusic.model.Genre" />
     </fragment>
 
-    <!--<fragment
+    <fragment
         android:id="@+id/playlistDetailsFragment"
         android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsFragment"
         android:label="PlaylistDetailsFragment"
@@ -23,7 +23,7 @@
         <argument
             android:name="extra_playlist"
             app:argType="code.name.monkey.retromusic.db.PlaylistWithSongs" />
-    </fragment>-->
+    </fragment>
 
     <fragment
         android:id="@+id/albumDetailsFragment"
diff --git a/build.gradle b/build.gradle
index b24265e1..23455001 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,8 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         def nav_version = "2.3.0"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.27.0"
+        //noinspection GradleDependency
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:4.5.1"
     }
 }
 
diff --git a/spotless.gradle b/spotless.gradle
index dc61fb50..94fb10f5 100644
--- a/spotless.gradle
+++ b/spotless.gradle
@@ -1,30 +1,17 @@
 apply plugin: "com.diffplug.gradle.spotless"
 spotless {
     java {
-        target "**/*.java"
+        target "src/*.java"
         trimTrailingWhitespace()
         removeUnusedImports()
         googleJavaFormat()
         endWithNewline()
     }
     kotlin {
-        target "**/*.kt"
+        target "src/*.kt"
         ktlint().userData(['indent_size': '4', 'continuation_indent_size': '2', 'disabled_rules': 'no-wildcard-imports'])
         licenseHeaderFile '../spotless.license.kt'
         trimTrailingWhitespace()
         endWithNewline()
     }
-    format 'misc', {
-        target '**/*.gradle', '**/*.md', '**/.gitignore'
-        indentWithSpaces()
-        trimTrailingWhitespace()
-        endWithNewline()
-    }
-
-    format 'xml', {
-        target '**/*.xml'
-        indentWithSpaces()
-        trimTrailingWhitespace()
-        endWithNewline()
-    }
 }
\ No newline at end of file