diff --git a/.github/workflows/pull-request-jobs.yml b/.github/workflows/pull-request-jobs.yml index e1a402e..6b087d8 100644 --- a/.github/workflows/pull-request-jobs.yml +++ b/.github/workflows/pull-request-jobs.yml @@ -40,7 +40,9 @@ jobs: if: always() with: name: ktLint Results - path: ./**/build/reports/ktlint/**/*ktlint*Check.txt + path: | + ./**/build/reports/ktlint/**/*ktlint*Check.txt + ./**/**/build/reports/ktlint/**/*ktlint*Check.txt retention-days: 1 - name: Run Lint run: ./gradlew lint @@ -49,7 +51,9 @@ jobs: if: always() with: name: Lint Results - path: ./**/build/reports/*lint-results*.html + path: | + ./**/build/reports/*lint-results*.html + ./**/**/build/reports/*lint-results*.html retention-days: 1 run-tests: diff --git a/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/DetailFragment.kt b/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/DetailFragment.kt index f5e58d3..8cd5618 100644 --- a/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/DetailFragment.kt +++ b/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/DetailFragment.kt @@ -14,4 +14,4 @@ class DetailFragment : Fragment(R.layout.fragment_detail) { super.onViewCreated(view, savedInstanceState) (view as TextView).text = getString(R.string.home_item, args.position) } -} \ No newline at end of file +} diff --git a/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/HomeFragment.kt b/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/HomeFragment.kt index 322ee50..1b255cb 100644 --- a/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/HomeFragment.kt +++ b/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/HomeFragment.kt @@ -41,4 +41,4 @@ class HomeFragment : Fragment(R.layout.fragment_home) { holder.itemView.setOnClickListener { onClick(position) } } } -} \ No newline at end of file +} diff --git a/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/NavControllerActivity.kt b/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/NavControllerActivity.kt index 83eaf44..0f038b8 100644 --- a/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/NavControllerActivity.kt +++ b/examplecase/example-navcontroller/src/main/java/org/fnives/test/showcase/examplecase/navcontroller/NavControllerActivity.kt @@ -12,4 +12,4 @@ class NavControllerActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_nav_controller) } -} \ No newline at end of file +} diff --git a/examplecase/example-navcontroller/src/sharedTest/java/org/fnives/test/showcase/examplecase/navcontroller/HomeNavigationTest.kt b/examplecase/example-navcontroller/src/sharedTest/java/org/fnives/test/showcase/examplecase/navcontroller/HomeNavigationTest.kt index 07fc945..6943f0f 100644 --- a/examplecase/example-navcontroller/src/sharedTest/java/org/fnives/test/showcase/examplecase/navcontroller/HomeNavigationTest.kt +++ b/examplecase/example-navcontroller/src/sharedTest/java/org/fnives/test/showcase/examplecase/navcontroller/HomeNavigationTest.kt @@ -111,4 +111,4 @@ class HomeNavigationTest { onFragment { action() } } } -} \ No newline at end of file +} diff --git a/gradlescripts/detekt.config.gradle b/gradlescripts/detekt.config.gradle index 0e47c48..2214998 100644 --- a/gradlescripts/detekt.config.gradle +++ b/gradlescripts/detekt.config.gradle @@ -4,8 +4,14 @@ detekt { def projectPaths = subprojects.collect { def projectName = it.name - "$projectDir/$projectName/src/main/java" - } + if (it.subprojects.isEmpty()) { + "$projectDir/$projectName/src/main/java" + } else { + it.subprojects.collect { sub -> + "$sub.projectDir//src/main/java" + } + } + }.flatten() source = files(*projectPaths) config = files("$projectDir/detekt/detekt.yml") diff --git a/gradlescripts/lint.gradle b/gradlescripts/lint.gradle index d906414..ce0fe30 100644 --- a/gradlescripts/lint.gradle +++ b/gradlescripts/lint.gradle @@ -6,7 +6,7 @@ subprojects { module -> warningsAsErrors true abortOnError true textReport true - ignore 'Overdraw' + ignore 'Overdraw', 'NewerVersionAvailable', 'GradleDependency' textOutput "stdout" } } @@ -17,7 +17,7 @@ subprojects { module -> warningsAsErrors true abortOnError true textReport true - ignore 'Overdraw' + ignore 'Overdraw', 'NewerVersionAvailable', 'GradleDependency' textOutput "stdout" } } @@ -27,7 +27,7 @@ subprojects { module -> warningsAsErrors true abortOnError true textReport true - ignore 'Overdraw' + ignore 'Overdraw', 'NewerVersionAvailable', 'GradleDependency' textOutput "stdout" } } diff --git a/gradlescripts/versions.gradle b/gradlescripts/versions.gradle index 6859a4e..b393ad4 100644 --- a/gradlescripts/versions.gradle +++ b/gradlescripts/versions.gradle @@ -5,7 +5,7 @@ project.ext { androidx_constraintlayout_version = "2.1.3" androidx_livedata_version = "2.4.0" androidx_swiperefreshlayout_version = "1.1.0" - room_version = "2.4.2" + room_version = "2.4.3" activity_ktx_version = "1.4.0" androidx_navigation = "2.4.0"