From de0c0e69f7a1665f8a7c06f0d688d6606be69495 Mon Sep 17 00:00:00 2001 From: Adam Kobus Date: Fri, 12 Aug 2022 19:14:08 +0200 Subject: [PATCH] Updated dependencies. 0.3.0 release --- CHANGELOG.md | 7 + README.md | 4 +- build.gradle | 6 +- .../com/adamkobus/compose/navigation/Lib.kt | 26 +- .../navigation/destination/NavRoute.kt | 4 +- detekt/config/custom.yml | 8 - detekt/config/default.yml | 271 ++++++------------ gradle/android-setup.gradle | 2 +- gradle/version.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- tutorial/build.gradle | 2 +- 11 files changed, 119 insertions(+), 215 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdc94d..e483730 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ +### Changes + + + +# 0.3.0 + ### Changes - Added `NavDestination.popUpTo` which is equivalent of `NavHostController.popBackStack(route, saveState, inclusive)` @@ -22,6 +28,7 @@ - #96 `NavStackEntry` is no longer nullable in `composableDestination` lambda - Improved error messages when reading NavStackEntry arguments - Added support for Long, Float, Double and Boolean navigation arguments +- updated AGP to 7.2.2, updated other dependencies # 0.2.0 diff --git a/README.md b/README.md index 3a09767..ecd2463 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ repositories { } dependencies { - implementation "com.adamkobus:compose-navigation:0.2.0" + implementation "com.adamkobus:compose-navigation:0.3.0" } ``` @@ -34,7 +34,7 @@ repositories { } dependencies { - implementation "com.adamkobus:compose-navigation:0.2.15-SNAPSHOT" + implementation "com.adamkobus:compose-navigation:0.3.0-SNAPSHOT" } ``` diff --git a/build.gradle b/build.gradle index 33e7112..86300f9 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,10 @@ apply plugin: "com.github.ben-manes.versions" buildscript { ext { // https://github.com/JLLeitschuh/ktlint-gradle/releases - ktlintPluginVersion = "10.2.1" + ktlintPluginVersion = "10.3.0" // https://github.com/detekt/detekt/releases - detektPluginVersion = "1.19.0" + detektPluginVersion = "1.21.0" // https://github.com/ben-manes/gradle-versions-plugin/releases versionsPluginVersion = "0.42.0" @@ -18,7 +18,7 @@ buildscript { publishPluginVersion = "1.1.0" // https://developer.android.com/studio/releases/gradle-plugin - androidBuildtoolsPluginVersion = "7.1.0" + androidBuildtoolsPluginVersion = '7.2.2' } repositories { diff --git a/buildSrc/src/main/java/com/adamkobus/compose/navigation/Lib.kt b/buildSrc/src/main/java/com/adamkobus/compose/navigation/Lib.kt index e841938..82d8f18 100644 --- a/buildSrc/src/main/java/com/adamkobus/compose/navigation/Lib.kt +++ b/buildSrc/src/main/java/com/adamkobus/compose/navigation/Lib.kt @@ -4,12 +4,14 @@ object Lib { /** * [Jetpack Compose Releases](https://developer.android.com/jetpack/androidx/versions/all-channel) */ - const val COMPOSE_VERSION = "1.2.0-alpha03" + const val COMPOSE_VERSION = "1.2.1" + + const val COMPOSE_COMPILER_VERSION = "1.3.0" /** * [Kotlin Releases](https://kotlinlang.org/docs/releases.html#release-details) */ - const val KOTLIN_VERSION = "1.6.10" + const val KOTLIN_VERSION = "1.7.10" /** * [Dokka Releases](https://github.com/Kotlin/dokka/releases) @@ -19,27 +21,27 @@ object Lib { /** * [Accompanist Version](https://github.com/google/accompanist/releases) */ - const val ACCOMPANIST_VERSION = "0.24.2-alpha" + const val ACCOMPANIST_VERSION = "0.25.1" /** * [Kotlint Coroutines Releases](https://github.com/Kotlin/kotlinx.coroutines/releases) */ - const val KOTLIN_COROUTINES_VERSION = "1.6.0" + const val KOTLIN_COROUTINES_VERSION = "1.6.4" /** * [Hilt Releases](https://github.com/google/dagger/releases) */ - const val HILT_VERSION = "2.40.5" + const val HILT_VERSION = "2.43.2" /** * [Ktlint Releases](https://github.com/pinterest/ktlint/releases) */ - const val KTLINT_VERSION = "0.43.2" + const val KTLINT_VERSION = "0.42.1" /** * [Appcompat Releases](https://developer.android.com/jetpack/androidx/releases/appcompat#1.4.1) */ - const val APPCOMPAT_VERSION = "1.4.1" + const val APPCOMPAT_VERSION = "1.5.0" object Kotlin { const val Coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$KOTLIN_COROUTINES_VERSION" @@ -49,7 +51,7 @@ object Lib { /** * [Compose Activity Releases](https://androidx.tech/artifacts/activity/activity-compose/) */ - const val Activity = "androidx.activity:activity-compose:1.4.0" + const val Activity = "androidx.activity:activity-compose:1.5.1" const val Ui = "androidx.compose.ui:ui:$COMPOSE_VERSION" const val Material = "androidx.compose.material:material:$COMPOSE_VERSION" const val ToolingPreview = "androidx.compose.ui:ui-tooling-preview:$COMPOSE_VERSION" @@ -63,7 +65,7 @@ object Lib { } object AndroidX { - const val Core = "androidx.core:core-ktx:1.7.0" + const val Core = "androidx.core:core-ktx:1.8.0" const val Appcompat = "androidx.appcompat:appcompat:$APPCOMPAT_VERSION" const val LifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0" const val LifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0" @@ -73,7 +75,7 @@ object Lib { /** * [Material Releases](https://github.com/material-components/material-components-android/releases) */ - const val Material = "com.google.android.material:material:1.5.0" + const val Material = "com.google.android.material:material:1.6.1" const val Hilt = "com.google.dagger:hilt-android:$HILT_VERSION" const val HiltCompiler = "com.google.dagger:hilt-android-compiler:$HILT_VERSION" @@ -87,7 +89,7 @@ object Lib { /** * [Lifecycle Aware ViewModel Releases](https://github.com/AdamKobus/lifecycle-aware-viewmodel/releases) */ - const val LifecycleAwareViewModel = "com.adamkobus:lifecycle-observer-viewmodel-ktx:1.0.1" + const val LifecycleAwareViewModel = "com.adamkobus:lifecycle-observer-viewmodel-ktx:1.0.2" } object Square { @@ -106,7 +108,7 @@ object Lib { /** * [Mockk Releases](https://github.com/mockk/mockk/releases) */ - const val Mockk = "io.mockk:mockk:1.12.2" + const val Mockk = "io.mockk:mockk:1.12.5" const val CoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$KOTLIN_COROUTINES_VERSION" } diff --git a/composenav/src/main/java/com/adamkobus/compose/navigation/destination/NavRoute.kt b/composenav/src/main/java/com/adamkobus/compose/navigation/destination/NavRoute.kt index aeb4005..106ab60 100644 --- a/composenav/src/main/java/com/adamkobus/compose/navigation/destination/NavRoute.kt +++ b/composenav/src/main/java/com/adamkobus/compose/navigation/destination/NavRoute.kt @@ -131,8 +131,8 @@ data class NavRoute constructor( } private fun ensureGraphNameAdded() { - if (parts.isEmpty() || parts[0] !is NavRoutePart.GraphName) { - throw IllegalStateException("Must add graphName as first part of the path") + check(parts.firstOrNull() is NavRoutePart.GraphName) { + "Must add graphName as first part of the path" } } diff --git a/detekt/config/custom.yml b/detekt/config/custom.yml index 1f9c6da..bb7c5d1 100644 --- a/detekt/config/custom.yml +++ b/detekt/config/custom.yml @@ -3,14 +3,6 @@ naming: ignoreAnnotated: - Composable -formatting: - ArgumentListWrapping: - maxLineLength: 140 - MaximumLineLength: - maxLineLength: 140 - ParameterListWrapping: - maxLineLength: 140 - style: MaxLineLength: maxLineLength: 140 diff --git a/detekt/config/default.yml b/detekt/config/default.yml index d777d87..6f3a520 100644 --- a/detekt/config/default.yml +++ b/detekt/config/default.yml @@ -1,4 +1,3 @@ -# current config: https://github.com/detekt/detekt/blob/main/detekt-core/src/main/resources/default-detekt-config.yml build: maxIssues: 0 excludeCorrectable: false @@ -37,9 +36,9 @@ console-reports: - 'ProjectStatisticsReport' - 'ComplexityReport' - 'NotificationReport' - # - 'FindingsReport' + - 'FindingsReport' - 'FileBasedFindingsReport' - - 'LiteFindingsReport' + # - 'LiteFindingsReport' output-reports: active: true @@ -47,6 +46,7 @@ output-reports: # - 'TxtOutputReport' # - 'XmlOutputReport' # - 'HtmlOutputReport' + # - 'MdOutputReport' comments: active: true @@ -63,10 +63,14 @@ comments: EndOfSentenceFormat: active: false endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)' + KDocReferencesNonPublicProperty: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] OutdatedDocumentation: active: false matchTypeParameters: true matchDeclarationsOrder: true + allowParamOnConstructorProperties: false UndocumentedPublicClass: active: false excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] @@ -129,9 +133,19 @@ complexity: NamedArguments: active: false threshold: 3 + ignoreArgumentsMatchingNames: false NestedBlockDepth: active: true threshold: 4 + NestedScopeFunctions: + active: false + threshold: 1 + functions: + - 'kotlin.apply' + - 'kotlin.run' + - 'kotlin.with' + - 'kotlin.let' + - 'kotlin.also' ReplaceSafeCallChainWithRun: active: false StringLiteralDuplication: @@ -158,17 +172,19 @@ coroutines: GlobalCoroutineUsage: active: false InjectDispatcher: - active: false + active: true dispatcherNames: - 'IO' - 'Default' - 'Unconfined' RedundantSuspendModifier: - active: false + active: true SleepInsteadOfDelay: + active: true + SuspendFunWithCoroutineScopeReceiver: active: false SuspendFunWithFlowReturnType: - active: false + active: true empty-blocks: active: true @@ -215,7 +231,7 @@ exceptions: - 'hashCode' - 'toString' InstanceOfCheckForException: - active: false + active: true excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] NotImplementedDeclaration: active: false @@ -276,192 +292,50 @@ exceptions: - 'RuntimeException' - 'Throwable' -formatting: - active: true - android: false - autoCorrect: true - AnnotationOnSeparateLine: - active: false - autoCorrect: true - AnnotationSpacing: - active: false - autoCorrect: true - ArgumentListWrapping: - active: false - autoCorrect: true - indentSize: 4 - maxLineLength: 120 - ChainWrapping: - active: true - autoCorrect: true - CommentSpacing: - active: true - autoCorrect: true - EnumEntryNameCase: - active: false - autoCorrect: true - Filename: - active: true - FinalNewline: - active: true - autoCorrect: true - insertFinalNewLine: true - ImportOrdering: - active: true - autoCorrect: true - layout: '*,java.**,javax.**,kotlin.**,^' - Indentation: - active: true - autoCorrect: true - indentSize: 4 - continuationIndentSize: 4 - MaximumLineLength: - active: true - maxLineLength: 120 - ignoreBackTickedIdentifier: false - ModifierOrdering: - active: true - autoCorrect: true - MultiLineIfElse: - active: false - autoCorrect: true - NoBlankLineBeforeRbrace: - active: true - autoCorrect: true - NoConsecutiveBlankLines: - active: true - autoCorrect: true - NoEmptyClassBody: - active: true - autoCorrect: true - NoEmptyFirstLineInMethodBlock: - active: false - autoCorrect: true - NoLineBreakAfterElse: - active: true - autoCorrect: true - NoLineBreakBeforeAssignment: - active: true - autoCorrect: true - NoMultipleSpaces: - active: true - autoCorrect: true - NoSemicolons: - active: true - autoCorrect: true - NoTrailingSpaces: - active: true - autoCorrect: true - NoUnitReturn: - active: true - autoCorrect: true - NoUnusedImports: - active: true - autoCorrect: true - NoWildcardImports: - active: true - PackageName: - active: false - autoCorrect: true - ParameterListWrapping: - active: true - autoCorrect: true - indentSize: 4 - maxLineLength: 120 - SpacingAroundAngleBrackets: - active: false - autoCorrect: true - SpacingAroundColon: - active: true - autoCorrect: true - SpacingAroundComma: - active: true - autoCorrect: true - SpacingAroundCurly: - active: true - autoCorrect: true - SpacingAroundDot: - active: true - autoCorrect: true - SpacingAroundDoubleColon: - active: false - autoCorrect: true - SpacingAroundKeyword: - active: true - autoCorrect: true - SpacingAroundOperators: - active: true - autoCorrect: true - SpacingAroundParens: - active: true - autoCorrect: true - SpacingAroundRangeOperator: - active: true - autoCorrect: true - SpacingAroundUnaryOperator: - active: false - autoCorrect: true - SpacingBetweenDeclarationsWithAnnotations: - active: false - autoCorrect: true - SpacingBetweenDeclarationsWithComments: - active: false - autoCorrect: true - StringTemplate: - active: true - autoCorrect: true - naming: active: true BooleanPropertyNaming: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] allowedPattern: '^(is|has|are)' + ignoreOverridden: true ClassNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] classPattern: '[A-Z][a-zA-Z0-9]*' ConstructorParameterNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] parameterPattern: '[a-z][A-Za-z0-9]*' privateParameterPattern: '[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' ignoreOverridden: true EnumNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] enumEntryPattern: '[A-Z][_a-zA-Z0-9]*' ForbiddenClassName: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] forbiddenName: [] FunctionMaxLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] maximumFunctionNameLength: 30 FunctionMinLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] minimumFunctionNameLength: 3 FunctionNaming: active: true excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] - functionPattern: '([a-z][a-zA-Z0-9]*)|(`.*`)' + functionPattern: '[a-z][a-zA-Z0-9]*' excludeClassPattern: '$^' ignoreOverridden: true FunctionParameterNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] parameterPattern: '[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' ignoreOverridden: true InvalidPackageDeclaration: - active: false + active: true rootPackage: '' + requireRootInDeclaration: false LambdaParameterNaming: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] parameterPattern: '[a-z][A-Za-z0-9]*|_' MatchingDeclarationName: active: true @@ -470,37 +344,30 @@ naming: active: true ignoreOverridden: true NoNameShadowing: - active: false + active: true NonBooleanPropertyPrefixedWithIs: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] ObjectPropertyNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] constantPattern: '[A-Za-z][_A-Za-z0-9]*' propertyPattern: '[A-Za-z][_A-Za-z0-9]*' privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*' PackageNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*' TopLevelPropertyNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] constantPattern: '[A-Z][_A-Z0-9]*' propertyPattern: '[A-Za-z][_A-Za-z0-9]*' privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*' VariableMaxLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] maximumVariableNameLength: 64 VariableMinLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] minimumVariableNameLength: 1 VariableNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] variablePattern: '[a-z][A-Za-z0-9]*' privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' @@ -510,6 +377,9 @@ performance: active: true ArrayPrimitive: active: true + CouldBeSequence: + active: false + threshold: 3 ForEachOnRange: active: true excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] @@ -522,7 +392,7 @@ performance: potential-bugs: active: true AvoidReferentialEquality: - active: false + active: true forbiddenTypePatterns: - 'kotlin.String' CastToNullableType: @@ -532,9 +402,20 @@ potential-bugs: DontDowncastCollectionTypes: active: false DoubleMutabilityForCollection: - active: false + active: true + mutableTypes: + - 'kotlin.collections.MutableList' + - 'kotlin.collections.MutableMap' + - 'kotlin.collections.MutableSet' + - 'java.util.ArrayList' + - 'java.util.LinkedHashSet' + - 'java.util.HashSet' + - 'java.util.LinkedHashMap' + - 'java.util.HashMap' DuplicateCaseInWhenExpression: active: true + ElseCaseInsteadOfExhaustiveWhen: + active: false EqualsAlwaysReturnsTrueOrFalse: active: true EqualsWithHashCodeExist: @@ -544,15 +425,16 @@ potential-bugs: ExplicitGarbageCollectionCall: active: true HasPlatformType: - active: false + active: true IgnoredReturnValue: - active: false + active: true restrictToAnnotatedMethods: true returnValueAnnotations: - '*.CheckResult' - '*.CheckReturnValue' ignoreReturnValueAnnotations: - '*.CanIgnoreReturnValue' + ignoreFunctionCall: [] ImplicitDefaultLocale: active: true ImplicitUnitReturnType: @@ -569,13 +451,15 @@ potential-bugs: excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] ignoreOnClassesPattern: '' MapGetWithNotNullAssertionOperator: - active: false + active: true MissingPackageDeclaration: active: false excludes: ['**/*.kts'] MissingWhenCase: active: true allowElseExpression: true + NullCheckOnMutableProperty: + active: false NullableToStringCall: active: false RedundantElseInWhen: @@ -587,7 +471,7 @@ potential-bugs: UnnecessarySafeCall: active: true UnreachableCatchBlock: - active: false + active: true UnreachableCode: active: true UnsafeCallOnNullableType: @@ -596,14 +480,19 @@ potential-bugs: UnsafeCast: active: true UnusedUnaryOperator: - active: false + active: true UselessPostfixExpression: - active: false + active: true WrongEqualsTypeParameter: active: true style: active: true + CanBeNonNullable: + active: false + CascadingCallWrapping: + active: false + includeElvis: true ClassOrdering: active: false CollapsibleIfStatements: @@ -614,7 +503,7 @@ style: DataClassShouldBeImmutable: active: false DestructuringDeclarationWithTooManyEntries: - active: false + active: true maxDestructuringEntries: 3 EqualsNullCall: active: true @@ -623,7 +512,7 @@ style: ExplicitCollectionElementAccessMethod: active: false ExplicitItLambdaParameter: - active: false + active: true ExpressionBodySyntax: active: false includeLineWrapping: false @@ -650,8 +539,11 @@ style: ignorePackages: - '*.internal' - '*.internal.*' - ForbiddenVoid: + ForbiddenSuppress: active: false + rules: [] + ForbiddenVoid: + active: true ignoreOverridden: false ignoreUsageInGenerics: false FunctionOnlyReturningConstant: @@ -670,7 +562,7 @@ style: maxJumpCount: 1 MagicNumber: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts'] ignoreNumbers: - '-1' - '0' @@ -690,6 +582,9 @@ style: active: false MandatoryBracesLoops: active: false + MaxChainedCallsOnSameLine: + active: false + maxChainedCalls: 5 MaxLineLength: active: true maxLineLength: 120 @@ -708,8 +603,10 @@ style: active: true NoTabs: active: false - ObjectLiteralToLambda: + NullableBooleanCheck: active: false + ObjectLiteralToLambda: + active: true OptionalAbstractKeyword: active: true OptionalUnit: @@ -723,7 +620,7 @@ style: RedundantExplicitType: active: false RedundantHigherOrderMapUsage: - active: false + active: true RedundantVisibilityModifierRule: active: false ReturnCount: @@ -748,16 +645,21 @@ style: UnderscoresInNumericLiterals: active: false acceptableLength: 4 + allowNonStandardGrouping: false UnnecessaryAbstractClass: active: true UnnecessaryAnnotationUseSiteTarget: active: false UnnecessaryApply: active: true - UnnecessaryFilter: + UnnecessaryBackticks: active: false + UnnecessaryFilter: + active: true UnnecessaryInheritance: active: true + UnnecessaryInnerClass: + active: false UnnecessaryLet: active: false UnnecessaryParentheses: @@ -772,13 +674,13 @@ style: active: true allowedNames: '(_|ignored|expected|serialVersionUID)' UseAnyOrNoneInsteadOfFind: - active: false + active: true UseArrayLiteralsInAnnotations: - active: false + active: true UseCheckNotNull: - active: false + active: true UseCheckOrError: - active: false + active: true UseDataClass: active: false allowVars: false @@ -789,19 +691,20 @@ style: UseIfInsteadOfWhen: active: false UseIsNullOrEmpty: - active: false + active: true UseOrEmpty: - active: false + active: true UseRequire: - active: false + active: true UseRequireNotNull: - active: false + active: true UselessCallOnNotNull: active: true UtilityClassWithPublicConstructor: active: true VarCouldBeVal: active: true + ignoreLateinitVar: false WildcardImport: active: true excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] diff --git a/gradle/android-setup.gradle b/gradle/android-setup.gradle index 71580e4..f4445d9 100644 --- a/gradle/android-setup.gradle +++ b/gradle/android-setup.gradle @@ -66,7 +66,7 @@ def configureAndroidProject(Project androidProject, boolean isApplication) { compose true } composeOptions { - kotlinCompilerExtensionVersion Lib.COMPOSE_VERSION + kotlinCompilerExtensionVersion Lib.COMPOSE_COMPILER_VERSION } packagingOptions { diff --git a/gradle/version.gradle b/gradle/version.gradle index a64eefc..bad6a7d 100644 --- a/gradle/version.gradle +++ b/gradle/version.gradle @@ -1,4 +1,4 @@ -def VERSION_BASE = "0.2.15" +def VERSION_BASE = "0.3.0" rootProject.readParam("mavenSnapshot", true) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4aac35a..72b7d93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jan 30 14:02:57 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/tutorial/build.gradle b/tutorial/build.gradle index 4adb3fb..dc279f6 100644 --- a/tutorial/build.gradle +++ b/tutorial/build.gradle @@ -12,7 +12,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion Lib.COMPOSE_VERSION + kotlinCompilerExtensionVersion Lib.COMPOSE_COMPILER_VERSION } }