Skip to content

Commit

Permalink
#9: Remove deprecated option 'android.defaults.buildfeatures.buildcon…
Browse files Browse the repository at this point in the history
…fig'
  • Loading branch information
arburk committed Dec 31, 2023
1 parent c592ac7 commit 26cf4b7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew build testDebugUnitTest jacocoTestReport
run: ./gradlew clean build testDebugUnitTest jacocoTestReport

- name: Sonar checks
env:
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jacoco {

tasks.register('jacocoTestReport', JacocoReport) {
dependsOn(testDebugUnitTest)
//dependsOn(testReleaseUnitTest)
dependsOn(testReleaseUnitTest)
//dependsOn(compileDebugJavaWithJavac)
//dependsOn(compileDebugKotlin)
//dependsOn(nexus5api27DebugAndroidTest)
Expand Down Expand Up @@ -145,7 +145,7 @@ tasks.register('jacocoTestReport', JacocoReport) {
sourceDirectories.setFrom(files([mainSrc]))
classDirectories.from = files([javaTree, kotlinTree])
executionData.setFrom(fileTree(dir: "$projectDir/build", includes: [
// "jacoco/testReleaseUnitTest.exec",
"jacoco/testReleaseUnitTest.exec",
"outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec",
// "outputs/managed_device_code_coverage/**/coverage.ec",
// "outputs/code_coverage/debugAndroidTest/connected/**/coverage.ec",
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
# Enable non-final resource IDs for faster incremental compilation
android.nonFinalResIds=true

0 comments on commit 26cf4b7

Please sign in to comment.