diff --git a/app/build.gradle b/app/build.gradle index c2ef5728c..8c2e9fda6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,6 @@ android { minSdk 21 targetSdk 31 - renderscriptTargetApi 29//must match target sdk and build tools vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" @@ -162,6 +161,4 @@ dependencies { implementation 'me.zhanghai.android.fastscroll:library:1.1.7' implementation 'cat.ereza:customactivityoncrash:2.3.0' debugImplementation 'com.github.amitshekhariitbhu:Android-Debug-Database:1.0.6' -} - -apply from: '../spotless.gradle' +} \ No newline at end of file diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle index 468e82ff3..407e90903 100644 --- a/appthemehelper/build.gradle +++ b/appthemehelper/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 31 + compileSdk 31 + defaultConfig { - minSdkVersion 21 - targetSdkVersion 31 - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - + minSdk 21 + targetSdk 31 } buildTypes { release { diff --git a/build.gradle b/build.gradle index e4eace34c..42064114f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" def nav_version = "2.4.0-beta02" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" - classpath "com.diffplug.spotless:spotless-plugin-gradle:6.0.4" } } diff --git a/spotless.gradle b/spotless.gradle deleted file mode 100644 index 7c8a5be2f..000000000 --- a/spotless.gradle +++ /dev/null @@ -1,30 +0,0 @@ -apply plugin: "com.diffplug.spotless" -spotless { - java { - target "src/*.java" - trimTrailingWhitespace() - removeUnusedImports() - googleJavaFormat() - endWithNewline() - } - kotlin { - 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 'src/*.xml' - indentWithSpaces() - trimTrailingWhitespace() - endWithNewline() - } -} \ No newline at end of file