FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict to use gradle task connectedCheck

This commit is contained in:
Shinokuni 2020-03-23 19:33:45 +01:00
parent 209070abd6
commit b103ed3a01
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/android.yml vendored
View File

@ -27,5 +27,5 @@ jobs:
uses: ReactiveCircus/android-emulator-runner@v2.5.0 uses: ReactiveCircus/android-emulator-runner@v2.5.0
with: with:
api-level: 29 api-level: 29
script: ./gradlew app:connectedAndroidTest readropsdb:connectedAndroidTest script: ./gradlew connectedCheck

5
readropslibrary/build.gradle
View File

@ -39,6 +39,11 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':readropsdb') 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 "androidx.core:core-ktx:1.2.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'