Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ captures/
.idea/inspectionProfiles/Project_Default.xml
.idea/kotlinc.xml
.idea/migrations.xml
/.idea/AndroidProjectSystem.xml

# Android Studio 3 in .gitignore file.
.idea/caches
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ allprojects {

subprojects { project ->
apply from: "$rootDir/detekt.gradle"

afterEvaluate {
tasks.withType(KotlinCompile).configureEach { task ->
kotlinOptions {
Expand Down
17 changes: 8 additions & 9 deletions detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ complexity:
active: false
threshold: 10
includeStaticDeclarations: false
ComplexMethod:
CyclomaticComplexMethod:
active: false
threshold: 20
ignoreSingleWhenExpression: false
Expand Down Expand Up @@ -273,8 +273,7 @@ performance:

potential-bugs:
active: true
DuplicateCaseInWhenExpression:
active: true
# DuplicateCaseInWhenExpression is deprecated as compiler performs this check by default
EqualsAlwaysReturnsTrueOrFalse:
active: true
EqualsWithHashCodeExist:
Expand Down Expand Up @@ -311,7 +310,7 @@ style:
active: true
DataClassContainsFunctions:
active: false
conversionFunctionPrefix: 'to'
conversionFunctionPrefix: ['to']
DestructuringDeclarationWithTooManyEntries:
active: false
EqualsNullCall:
Expand All @@ -320,14 +319,14 @@ style:
active: false
ForbiddenComment:
active: false
values: ['TODO:', 'FIXME:', 'STOPSHIP:']
comments: ['TODO:', 'FIXME:', 'STOPSHIP:']
ForbiddenImport:
active: false
imports: []
FunctionOnlyReturningConstant:
active: true
ignoreOverridableFunction: true
excludedFunctions: 'describeContents'
excludedFunctions: ['describeContents']
LoopWithTooManyJumpStatements:
active: true
maxJumpCount: 3
Expand All @@ -341,7 +340,7 @@ style:
ignoreAnnotation: false
ignoreNamedArgument: true
ignoreEnums: false
MandatoryBracesIfStatements:
BracesOnIfStatements:
active: false # TODO: consider this
MaxLineLength:
excludes: ['**/test/**', '.*Test.kt']
Expand All @@ -364,7 +363,7 @@ style:
active: true
OptionalUnit:
active: false
OptionalWhenBraces:
BracesOnWhenStatements:
active: false
PreferToOverPairSyntax:
active: true
Expand All @@ -375,7 +374,7 @@ style:
ReturnCount:
active: false
max: 2
excludedFunctions: "equals"
excludedFunctions: ["equals"]
SafeCast:
active: true
SerialVersionUIDInSerializableClass:
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ org.gradle.jvmargs=-Xms128m -Xmx4096m -XX:MaxMetaspaceSize=2g
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

# Suppress Kotlin-Compose compatibility check
suppressKotlinVersionCompatibilityCheck=true
2 changes: 1 addition & 1 deletion gradle/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ configure(coveredProjects) { prj ->
apply plugin: 'jacoco'

jacoco {
toolVersion = "0.8.7"
toolVersion = "0.8.11"
}

task jacocoReport(type: JacocoReport, dependsOn: 'testDebugUnitTest') {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import kotlin.reflect.KClass

private const val IMMUTABLE_LIST_MESSAGE =
"Use the immutable listOf(...) method instead. You can append it with `val newList = listA + listB`"
private const val IMMUTABLE_MAP_MESSAGE =
"Use the immutable mapOf(...) method instead. You can append it with `val newMap = mapA + mapB`"

/**
* Ensures that the state class is immutable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ abstract class MavericksRepository<S : MavericksState>(
@InternalMavericksApi
protected val stateStore: MavericksStateStore<S> = config.stateStore

private val tag by lazy { javaClass.simpleName }

private val mutableStateChecker = if (config.performCorrectnessValidations) MutableStateChecker(config.stateStore.state) else null

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class SimpleCountingIdlingResource(private val resourceName: String) : IdlingRes
// we've gone from non-zero to zero. That means we're idle now! Tell espresso.
resourceCallback?.onTransitionToIdle()
} else if (counterVal < 0) {
throw IllegalArgumentException("Counter has been corrupted!")
error("Counter has been corrupted!")
}
}
}
74 changes: 8 additions & 66 deletions versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,7 @@ version.rxjava2.rxjava=2.2.21

version.rxjava2.rxandroid=2.1.1

version.robolectric=4.8.1
## # available=4.8.2
## # available=4.9-alpha-1
## # available=4.9
## # available=4.9.1
## # available=4.9.2
## # available=4.10-alpha-1
## # available=4.10
## # available=4.10.1
## # available=4.10.2
## # available=4.10.3
## # available=4.11-beta-1
## # available=4.11-beta-2
## # available=4.11
## # available=4.11.1
version.robolectric=4.10.3

version.retrofit2=2.9.0
## # available=2.10.0
Expand Down Expand Up @@ -116,7 +102,7 @@ version.kotlinx.coroutines=1.6.4
## # available=1.8.0
## # available=1.8.1-Beta

version.kotlin=1.8.22
version.kotlin=1.9.22
## # available=1.9.0-Beta
## # available=1.9.0-RC
## # available=1.9.0
Expand Down Expand Up @@ -191,39 +177,9 @@ version.io.gitlab.arturbosch.detekt..detekt-formatting=1.21.0
## # available=1.23.5
## # available=1.23.6

version.google.dagger=2.43.2
## # available=2.44
## # available=2.44.1
## # available=2.44.2
## # available=2.45
## # available=2.46
## # available=2.46.1
## # available=2.47
## # available=2.48
## # available=2.48.1
## # available=2.49
## # available=2.50
## # available=2.51

version.com.vanniktech..gradle-maven-publish-plugin=0.22.0
## # available=0.23.0
## # available=0.23.1
## # available=0.23.2
## # available=0.24.0
## # available=0.25.0-rc1
## # available=0.25.0
## # available=0.25.1
## # available=0.25.2-rc1
## # available=0.25.2
## # available=0.25.3-rc1
## # available=0.25.3
## # available=0.26.0-rc1
## # available=0.26.0
## # available=0.27.0-rc1
## # available=0.27.0-rc2
## # available=0.27.0
## # available=0.28.0-rc1
## # available=0.28.0
version.google.dagger=2.50

version.com.vanniktech..gradle-maven-publish-plugin=0.31.0

version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.2.0

Expand Down Expand Up @@ -704,8 +660,8 @@ version.androidx.compose.foundation=1.2.1
## # available=1.7.0-alpha04
## # available=1.7.0-alpha05

## unused
version.androidx.compose.compiler=1.4.8
# For Kotlin 1.9.23, we need a compatible Compose compiler version
version.androidx.compose.compiler=1.5.8

version.androidx.cardview=1.0.0

Expand Down Expand Up @@ -759,21 +715,7 @@ version.androidx.activity=1.5.1
## # available=1.9.0-alpha03
## # available=1.9.0-beta01

plugin.io.gitlab.arturbosch.detekt=1.21.0
## # available=1.22.0-RC1
## # available=1.22.0-RC2
## # available=1.22.0-RC3
## # available=1.22.0
## # available=1.23.0-RC1
## # available=1.23.0-RC2
## # available=1.23.0-RC3
## # available=1.23.0
## # available=1.23.1
## # available=1.23.2
## # available=1.23.3
## # available=1.23.4
## # available=1.23.5
## # available=1.23.6
plugin.io.gitlab.arturbosch.detekt=1.23.6

version.anvil=2.4.6
### available=2.4.7
Expand Down