Skip to content

Commit

Permalink
[#4] Fix PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
blyscuit committed Sep 20, 2022
1 parent 77b8a53 commit f9ed8e1
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ warn("Please add labels to this PR") if github.pr_labels.empty?
commit_lint.check warn: :all, disable: [:subject_length]

# Detekt output check
detekt_dir = "**/build/reports/detekt/detekt.xml"
detekt_dir = "**/build/reports/detekt/detekt-result.xml"
Dir[detekt_dir].each do |file_name|
kotlin_detekt.skip_gradle_task = true
kotlin_detekt.report_file = file_name
Expand Down
8 changes: 4 additions & 4 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ plugins {
}

android {
compileSdk = Android.CompileSdk
compileSdk = Android.COMPILE_SDK
defaultConfig {
applicationId = "co.nimblehq.blisskmmic.android"
minSdk = Android.MinSdk
targetSdk = Android.CompileSdk
minSdk = Android.MIN_SDK
targetSdk = Android.TARGET_SDK
versionCode = 1
versionName = "1.0"
}
Expand All @@ -24,4 +24,4 @@ dependencies {
implementation("com.google.android.material:material:1.4.0")
implementation("androidx.appcompat:appcompat:1.3.1")
implementation("androidx.constraintlayout:constraintlayout:2.1.0")
}
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ plugins {

repositories {
mavenCentral()
}
}
7 changes: 4 additions & 3 deletions buildSrc/src/main/kotlin/myPackage/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
object Android {
const val CompileSdk = 32
const val MinSdk = 26
}
const val COMPILE_SDK = 32
const val TARGET_SDK = 32
const val MIN_SDK = 26
}
32 changes: 17 additions & 15 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,33 @@ kotlin {
}

android {
compileSdk = Android.CompileSdk
compileSdk = Android.COMPILE_SDK
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdk = Android.MinSdk
targetSdk = Android.CompileSdk
minSdk = Android.MIN_SDK
targetSdk = Android.TARGET_SDK
}
}

detekt {
source = files(
"./"
)
parallel = false
config = files("../detekt-config.yml")
buildUponDefaultConfig = false
disableDefaultRuleSets = false

ignoreFailures = false
source = files(
"./"
)
parallel = false
config = files("../detekt-config.yml")
buildUponDefaultConfig = false
disableDefaultRuleSets = false
ignoreFailures = false
}

tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
reports {
reports {
xml {
outputLocation.set(file("build/reports/detekt/detekt-result.xml"))
required.set(true) // reports can also be enabled and disabled at the task level as needed
}
html.required.set(true)
xml.required.set(true)
}
}
}

tasks.check {
Expand Down

0 comments on commit f9ed8e1

Please sign in to comment.