Skip to content

Commit

Permalink
Remove PackageDirectoryMismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
illarionov committed May 18, 2024
1 parent e434dd3 commit 27eef04
Show file tree
Hide file tree
Showing 52 changed files with 8 additions and 98 deletions.
3 changes: 2 additions & 1 deletion config/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ naming:
ignoreAnnotated: ['Composable', 'ParameterizedTest']
NoNameShadowing:
active: false
# Temporarily disabled until we figure out how to apply it to the current directory structure
InvalidPackageDeclaration:
active: true
active: false
rootPackage: "ru.pixnews"
requireRootInDeclaration: false
TopLevelPropertyNaming:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.base

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("MagicNumber", "MaxLineLength", "PackageDirectoryMismatch")
@file:Suppress("MagicNumber", "MaxLineLength")

package ru.pixnews.gradle.project.android

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.CommonExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.ApkSigningConfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.CommonExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.CommonExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch", "NULLABLE_PROPERTY_TYPE")
@file:Suppress("NULLABLE_PROPERTY_TYPE")

package ru.pixnews.gradle.project.android

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.ApplicationExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.ApplicationExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.LibraryExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import androidx.room.gradle.RoomExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import androidx.room.gradle.RoomExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("UnstableApiUsage", "PackageDirectoryMismatch")
@file:Suppress("UnstableApiUsage")

package ru.pixnews.gradle.project.android

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("UnstableApiUsage", "PackageDirectoryMismatch")
@file:Suppress("UnstableApiUsage")

package ru.pixnews.gradle.project.android

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.android

import com.android.build.api.dsl.TestExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.base

import buildparameters.BuildParametersExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.base

import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.base

public enum class UnitTestEngine {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.base.compose

import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project

import buildparameters.BuildParametersExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import org.gradle.api.DefaultTask
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import java.util.Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import com.squareup.kotlinpoet.ClassName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import java.io.Serializable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import org.gradle.api.file.RegularFileProperty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.util

import com.android.build.api.variant.AndroidComponentsExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.util

import org.gradle.api.provider.Property
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.util

import java.io.File
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import io.kotest.matchers.shouldBe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.config.igdb

import com.squareup.kotlinpoet.ClassName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.di

import com.google.devtools.ksp.gradle.KspTaskJvm
import org.gradle.api.artifacts.VersionCatalog
import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.di

import com.google.devtools.ksp.gradle.KspTaskJvm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.kotlin

import org.gradle.api.artifacts.transform.InputArtifact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.kotlin

import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.kotlin

import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.lint

import com.android.build.api.dsl.Lint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.lint

import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.lint

import com.android.build.api.dsl.Lint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.lint

import com.android.build.api.dsl.CommonExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.lint

import io.gitlab.arturbosch.detekt.Detekt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch")

package ru.pixnews.gradle.project.lint

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/

@file:Suppress("PackageDirectoryMismatch", "SpacingBetweenPackageAndImports")
@file:Suppress("SpacingBetweenPackageAndImports")

package ru.pixnews.gradle.project.lint

Expand Down
Loading

0 comments on commit 27eef04

Please sign in to comment.