From b103ed3a0112b235baf29da096c5c72ede2cf08b Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Mon, 23 Mar 2020 19:33:45 +0100 Subject: [PATCH] Fix conflict to use gradle task connectedCheck --- .github/workflows/android.yml | 2 +- readropslibrary/build.gradle | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 3a3287ec..a00b8662 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -27,5 +27,5 @@ jobs: uses: ReactiveCircus/android-emulator-runner@v2.5.0 with: api-level: 29 - script: ./gradlew app:connectedAndroidTest readropsdb:connectedAndroidTest + script: ./gradlew connectedCheck diff --git a/readropslibrary/build.gradle b/readropslibrary/build.gradle index 7a733f0e..c4a4697c 100644 --- a/readropslibrary/build.gradle +++ b/readropslibrary/build.gradle @@ -39,6 +39,11 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':readropsdb') + // xpp3 has a conflict with kxml when running connectedCheck task + configurations { + all*.exclude group: 'xpp3', module: 'xpp3' + } + implementation "androidx.core:core-ktx:1.2.0" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0'