merged upstream/dev

This commit is contained in:
Ritvik Saraf 2019-01-29 22:32:58 +05:30
commit 7a11a72935
119 changed files with 2960 additions and 1715 deletions

View file

@ -8,18 +8,20 @@ android {
applicationId "org.schabi.newpipe"
minSdkVersion 19
targetSdkVersion 28
versionCode 70
versionName "0.15.0"
versionCode 71
versionName "0.15.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
multiDexEnabled true
debuggable true
@ -33,6 +35,7 @@ android {
// but continue the build even when errors are found:
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@ -54,7 +57,7 @@ dependencies {
exclude module: 'support-annotations'
})
implementation 'com.github.yausername:NewPipeExtractor:25ed9de'
implementation 'com.github.yausername:NewPipeExtractor:f97d5ab'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.23.0'