Skip to content

Commit 3c6c4dd

Browse files
committed
Fixed some inspect code warnings/errors
1 parent 40bb617 commit 3c6c4dd

12 files changed

+30
-45
lines changed

build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
import extensions.applyDefault
1818

19-
plugins.apply("git-hooks-config")
20-
plugins.apply("update-dependencies-config")
19+
plugins.apply(BuildPlugins.GIT_HOOKS)
20+
plugins.apply(BuildPlugins.UPDATE_DEPENDENCIES)
2121

2222
allprojects {
2323
repositories.applyDefault()
2424

25-
plugins.apply("detekt-config")
26-
plugins.apply("dokka-config")
27-
plugins.apply("ktlint-config")
28-
plugins.apply("spotless-config")
25+
plugins.apply(BuildPlugins.DETEKT)
26+
plugins.apply(BuildPlugins.DOKKA)
27+
plugins.apply(BuildPlugins.KTLINT)
28+
plugins.apply(BuildPlugins.SPOTLESS)
2929
}

buildSrc/src/main/kotlin/BuildPlugins.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ object BuildPlugins {
2828
const val KOTLIN_ALLOPEN = "kotlin-allopen"
2929

3030
const val NAVIGATION_SAFE_ARGS = "androidx.navigation.safeargs.kotlin"
31-
const val SPOTLESS = "com.diffplug.gradle.spotless"
32-
const val DETEKT = "io.gitlab.arturbosch.detekt"
3331
const val JACOCO = "com.vanniktech.android.junit.jacoco"
3432
const val FABRIC = "io.fabric"
33+
34+
const val DETEKT = "plugins.detekt"
35+
const val DOKKA = "plugins.dokka"
36+
const val GIT_HOOKS = "plugins.git-hooks"
37+
const val KTLINT = "plugins.ktlint"
38+
const val SPOTLESS = "plugins.spotless"
39+
const val UPDATE_DEPENDENCIES = "plugins.update-dependencies"
3540
}

buildSrc/src/main/kotlin/scripts/detekt-config.gradle.kts renamed to buildSrc/src/main/kotlin/plugins/detekt.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
package plugins
18+
1719
import io.gitlab.arturbosch.detekt.DetektPlugin
1820
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
1921

buildSrc/src/main/kotlin/scripts/dokka-config.gradle.kts renamed to buildSrc/src/main/kotlin/plugins/dokka.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
package plugins
18+
1719
import org.jetbrains.dokka.gradle.DokkaPlugin
1820
import org.jetbrains.dokka.gradle.DokkaTask
1921

buildSrc/src/main/kotlin/scripts/git-hooks-config.gradle.kts renamed to buildSrc/src/main/kotlin/plugins/git-hooks.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
package plugins
18+
1719
import utils.isLinuxOrMacOs
1820

1921
tasks {

buildSrc/src/main/kotlin/scripts/ktlint-config.gradle.kts renamed to buildSrc/src/main/kotlin/plugins/ktlint.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
package plugins
18+
1719
val ktlint: Configuration by configurations.creating
1820

1921
dependencies {

buildSrc/src/main/kotlin/scripts/spotless-config.gradle.kts renamed to buildSrc/src/main/kotlin/plugins/spotless.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
package plugins
18+
1719
import com.diffplug.gradle.spotless.SpotlessExtension
1820
import com.diffplug.gradle.spotless.SpotlessPlugin
1921

@@ -71,7 +73,7 @@ configure<SpotlessExtension> {
7173
target("**/*.gradle.kts", "*.gradle.kts")
7274
licenseHeaderFile(
7375
rootProject.file("COPYRIGHT"),
74-
"import|tasks|apply|plugins|include|val|object|interface"
76+
"package|import|tasks|apply|plugins|include|val|object|interface"
7577
)
7678
trimTrailingWhitespace()
7779
indentWithSpaces()

buildSrc/src/main/kotlin/scripts/update-dependencies-config.gradle.kts renamed to buildSrc/src/main/kotlin/plugins/update-dependencies.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
package plugins
18+
1719
import com.github.benmanes.gradle.versions.VersionsPlugin
1820
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
1921

buildSrc/src/main/kotlin/utils/CrashlyticsUtils.kt

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package utils
1919
import org.gradle.api.Project
2020
import java.io.File
2121
import java.lang.Exception
22-
import extensions.getLocalProperty
2322

2423
private const val FABRIC_PROPERTIES_FILE_NAME = "app/fabric.properties"
2524
private const val FABRIC_API_KEY_PROPERTY_NAME = "fabric.key"

core/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.vmadalin.core" />
1+
<manifest package="com.vmadalin.core" />

core/src/main/kotlin/com/vmadalin/core/network/NetworkState.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sealed class NetworkState {
3232
val isAdditional: Boolean = false
3333
) : NetworkState()
3434

35-
fun isLoading() = this is NetworkState.Loading
36-
fun isSuccess() = this is NetworkState.Success
37-
fun isError() = this is NetworkState.Error
35+
fun isLoading() = this is Loading
36+
fun isSuccess() = this is Success
37+
fun isError() = this is Error
3838
}

core/src/main/kotlin/com/vmadalin/core/ui/base/BaseViewModel.kt

-30
This file was deleted.

0 commit comments

Comments
 (0)