Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Detekt from main and compose projects. #426

Merged
merged 1 commit into from
May 19, 2021
Merged

Remove Detekt from main and compose projects. #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion .github/workflows/compose-kotlin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ jobs:
- apiCheck
- lint
- ktlintCheck
- detekt
steps:
- uses: actions/checkout@v2
- name: set up JDK 11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kotlin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

## Actual task
- name: Check with Gradle
run: ./gradlew test apiCheck lint ktlintCheck detekt jmhJar --no-daemon --stacktrace --continue
run: ./gradlew test apiCheck lint ktlintCheck jmhJar --no-daemon --stacktrace --continue
# Decoder:
# --continue: Run all checks, even if some fail.
# test: unit tests
Expand Down
5 changes: 0 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
buildscript {
dependencies {
classpath(Dependencies.android_gradle_plugin)
classpath(Dependencies.detekt)
classpath(Dependencies.dokka)
classpath(Dependencies.Jmh.gradlePlugin)
classpath(Dependencies.Kotlin.binaryCompatibilityValidatorPlugin)
Expand Down Expand Up @@ -36,11 +35,7 @@ subprojects {
}

apply(plugin = "org.jlleitschuh.gradle.ktlint")
apply(plugin = "io.gitlab.arturbosch.detekt")
afterEvaluate {
tasks.findByName("check")
?.dependsOn("detekt")

// Can't use the normal placeholder syntax to reference the reflect version, since that
// placeholder seems to only be evaluated if the module has a direct dependency on the library.
val kotlinReflectVersion = File(rootDir, "versions.properties")
Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/java/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ object Dependencies {
const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:_"
const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:_"
const val lanterna = "com.googlecode.lanterna:lanterna:_"
const val detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:_"
const val okio = "com.squareup.okio:okio:_"

object RxJava2 {
Expand Down
12 changes: 0 additions & 12 deletions compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jlleitschuh.gradle.ktlint.KtlintExtension
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

buildscript {
dependencies {
classpath(Dependencies.android_gradle_plugin)
classpath(Dependencies.detekt)
classpath(Dependencies.dokka)
classpath(Dependencies.Kotlin.binaryCompatibilityValidatorPlugin)
classpath(Dependencies.Kotlin.gradlePlugin)
Expand Down Expand Up @@ -53,11 +51,7 @@ subprojects {
}

apply(plugin = "org.jlleitschuh.gradle.ktlint")
apply(plugin = "io.gitlab.arturbosch.detekt")
afterEvaluate {
tasks.findByName("check")
?.dependsOn("detekt")

configurations.configureEach {
// There could be transitive dependencies in tests with a lower version. This could cause
// problems with a newer Kotlin version that we use.
Expand Down Expand Up @@ -106,12 +100,6 @@ subprojects {
)
)
}

configure<DetektExtension> {
config = files("${rootDir}/detekt.yml")
// Treat config file as an override for the default config.
buildUponDefaultConfig = true
}
}

apply(from = rootProject.file(".buildscript/binary-validation.gradle"))
1 change: 0 additions & 1 deletion compose/buildSrc/src/main/java/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ object Dependencies {
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:0.10.0"
const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.11.1"
const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:9.2.0"
const val detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.1"

object Test {
object AndroidX {
Expand Down
20 changes: 0 additions & 20 deletions compose/detekt.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ version.com.squareup..seismic=1.0.2
version.com.vanniktech..gradle-maven-publish-plugin=0.13.0
version.cycler=0.1.4
version.google.android.material=1.1.0
version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.0.1
version.io.mockk..mockk=1.10.0
version.io.reactivex.rxjava2..rxandroid=2.1.1
version.io.reactivex.rxjava2..rxjava=2.2.19
Expand Down