Upgrade some dependencies
This commit is contained in:
parent
176d57b35a
commit
7231150115
4 changed files with 71 additions and 67 deletions
|
@ -5,13 +5,13 @@ android:
|
||||||
components:
|
components:
|
||||||
# The BuildTools version used by NewPipe
|
# The BuildTools version used by NewPipe
|
||||||
- tools
|
- tools
|
||||||
- build-tools-28.0.3
|
- build-tools-29.0.3
|
||||||
|
|
||||||
# The SDK version used to compile NewPipe
|
# The SDK version used to compile NewPipe
|
||||||
- android-28
|
- android-29
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- yes | sdkmanager "platforms;android-28"
|
- yes | sdkmanager "platforms;android-29"
|
||||||
script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
|
script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
|
||||||
|
|
||||||
licenses:
|
licenses:
|
||||||
|
|
125
app/build.gradle
125
app/build.gradle
|
@ -5,14 +5,14 @@ apply plugin: 'kotlin-kapt'
|
||||||
apply plugin: 'checkstyle'
|
apply plugin: 'checkstyle'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 28
|
compileSdkVersion 29
|
||||||
buildToolsVersion '28.0.3'
|
buildToolsVersion '29.0.3'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "org.schabi.newpipe"
|
applicationId "org.schabi.newpipe"
|
||||||
resValue "string", "app_name", "NewPipe"
|
resValue "string", "app_name", "NewPipe"
|
||||||
minSdkVersion 19
|
minSdkVersion 19
|
||||||
targetSdkVersion 28
|
targetSdkVersion 29
|
||||||
versionCode 930
|
versionCode 930
|
||||||
versionName "0.19.3"
|
versionName "0.19.3"
|
||||||
|
|
||||||
|
@ -80,22 +80,22 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
androidxLibVersion = '1.1.0'
|
icepickVersion = '3.2.0'
|
||||||
exoPlayerLibVersion = '2.11.4'
|
checkstyleVersion = '8.32'
|
||||||
roomDbLibVersion = '2.1.0'
|
stethoVersion = '1.5.1'
|
||||||
leakCanaryLibVersion = '1.5.4' //1.6.1
|
leakCanaryVersion = '1.5.4'
|
||||||
okHttpLibVersion = '3.12.6'
|
exoPlayerVersion = '2.11.4'
|
||||||
icepickLibVersion = '3.2.0'
|
androidxLifecycleVersion = '2.2.0'
|
||||||
stethoLibVersion = '1.5.0'
|
androidxRoomVersion = '2.2.5'
|
||||||
markwonVersion = '4.2.1'
|
groupieVersion = '2.8.0'
|
||||||
checkstyleVersion = '8.31'
|
markwonVersion = '4.3.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
checkstyle {
|
checkstyle {
|
||||||
configFile rootProject.file('checkstyle.xml')
|
configFile rootProject.file('checkstyle.xml')
|
||||||
ignoreFailures false
|
ignoreFailures false
|
||||||
showViolations true
|
showViolations true
|
||||||
toolVersion = "${checkstyleVersion}"
|
toolVersion = checkstyleVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
task runCheckstyle(type: Checkstyle) {
|
task runCheckstyle(type: Checkstyle) {
|
||||||
|
@ -140,70 +140,73 @@ afterEvaluate {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
|
||||||
|
implementation "frankiesardo:icepick:${icepickVersion}"
|
||||||
|
kapt "frankiesardo:icepick-processor:${icepickVersion}"
|
||||||
|
|
||||||
debugImplementation "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
|
debugImplementation "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
|
||||||
ktlint "com.pinterest:ktlint:0.35.0"
|
ktlint "com.pinterest:ktlint:0.35.0"
|
||||||
|
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
|
||||||
androidTestImplementation "android.arch.persistence.room:testing:1.1.1"
|
debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
|
||||||
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
|
|
||||||
|
debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
|
||||||
|
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
|
||||||
|
|
||||||
|
debugImplementation "androidx.multidex:multidex:2.0.1"
|
||||||
|
|
||||||
|
testImplementation 'junit:junit:4.13'
|
||||||
|
testImplementation 'org.mockito:mockito-core:3.3.3'
|
||||||
|
|
||||||
|
androidTestImplementation "androidx.test.ext:junit:1.1.1"
|
||||||
|
androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
|
||||||
|
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0", {
|
||||||
exclude module: 'support-annotations'
|
exclude module: 'support-annotations'
|
||||||
})
|
}
|
||||||
|
|
||||||
implementation 'com.github.TeamNewPipe:NewPipeExtractor:f3913e241e379adf0091319091e8f895c5fcfd07'
|
implementation 'com.github.TeamNewPipe:NewPipeExtractor:f3913e241e379adf0091319091e8f895c5fcfd07'
|
||||||
testImplementation 'junit:junit:4.12'
|
|
||||||
testImplementation 'org.mockito:mockito-core:2.23.0'
|
|
||||||
|
|
||||||
implementation "androidx.appcompat:appcompat:${androidxLibVersion}"
|
implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
|
||||||
implementation "com.google.android.material:material:${androidxLibVersion}"
|
implementation "org.jsoup:jsoup:1.9.2"
|
||||||
implementation "androidx.recyclerview:recyclerview:${androidxLibVersion}"
|
|
||||||
implementation "androidx.preference:preference:${androidxLibVersion}"
|
implementation "com.squareup.okhttp3:okhttp:3.12.11"
|
||||||
|
|
||||||
|
implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
|
||||||
|
implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
|
||||||
|
|
||||||
|
implementation "com.google.android.material:material:1.1.0"
|
||||||
|
|
||||||
|
implementation "androidx.appcompat:appcompat:1.1.0"
|
||||||
|
implementation "androidx.preference:preference:1.1.1"
|
||||||
|
implementation "androidx.recyclerview:recyclerview:1.1.0"
|
||||||
implementation "androidx.cardview:cardview:1.0.0"
|
implementation "androidx.cardview:cardview:1.0.0"
|
||||||
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
|
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
|
||||||
|
|
||||||
implementation 'com.xwray:groupie:2.7.0'
|
implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
|
||||||
implementation 'com.xwray:groupie-kotlin-android-extensions:2.7.0'
|
implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
|
||||||
|
implementation "androidx.lifecycle:lifecycle-extensions:${androidxLifecycleVersion}"
|
||||||
|
|
||||||
implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
|
implementation "androidx.room:room-runtime:${androidxRoomVersion}"
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
|
implementation "androidx.room:room-rxjava2:${androidxRoomVersion}"
|
||||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
|
kapt "androidx.room:room-compiler:${androidxRoomVersion}"
|
||||||
|
|
||||||
// Originally in NewPipeExtractor
|
implementation "com.xwray:groupie:${groupieVersion}"
|
||||||
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
|
implementation "com.xwray:groupie-kotlin-android-extensions:${groupieVersion}"
|
||||||
implementation 'org.jsoup:jsoup:1.9.2'
|
|
||||||
|
|
||||||
implementation 'ch.acra:acra:4.9.2' //4.11
|
implementation "de.hdodenhof:circleimageview:3.1.0"
|
||||||
|
implementation "com.nostra13.universalimageloader:universal-image-loader:1.9.5"
|
||||||
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
|
|
||||||
implementation 'de.hdodenhof:circleimageview:2.2.0'
|
|
||||||
implementation 'com.nononsenseapps:filepicker:4.2.1'
|
|
||||||
|
|
||||||
implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
|
|
||||||
implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"
|
|
||||||
|
|
||||||
debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
|
|
||||||
debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
|
|
||||||
debugImplementation 'androidx.multidex:multidex:2.0.1'
|
|
||||||
|
|
||||||
implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
|
|
||||||
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
|
|
||||||
implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
|
|
||||||
implementation 'org.ocpsoft.prettytime:prettytime:4.0.3.Final'
|
|
||||||
|
|
||||||
implementation "androidx.room:room-runtime:${roomDbLibVersion}"
|
|
||||||
implementation "androidx.room:room-rxjava2:${roomDbLibVersion}"
|
|
||||||
kapt "androidx.room:room-compiler:${roomDbLibVersion}"
|
|
||||||
|
|
||||||
implementation "frankiesardo:icepick:${icepickLibVersion}"
|
|
||||||
kapt "frankiesardo:icepick-processor:${icepickLibVersion}"
|
|
||||||
|
|
||||||
debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
|
|
||||||
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"
|
|
||||||
|
|
||||||
implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
|
|
||||||
debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
|
|
||||||
|
|
||||||
implementation "io.noties.markwon:core:${markwonVersion}"
|
implementation "io.noties.markwon:core:${markwonVersion}"
|
||||||
implementation "io.noties.markwon:linkify:${markwonVersion}"
|
implementation "io.noties.markwon:linkify:${markwonVersion}"
|
||||||
|
|
||||||
|
implementation "com.nononsenseapps:filepicker:4.2.1"
|
||||||
|
|
||||||
|
implementation "ch.acra:acra:4.9.2"
|
||||||
|
|
||||||
|
implementation "io.reactivex.rxjava2:rxjava:2.2.19"
|
||||||
|
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
|
||||||
|
implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0"
|
||||||
|
|
||||||
|
implementation "org.ocpsoft.prettytime:prettytime:4.0.5.Final"
|
||||||
}
|
}
|
||||||
|
|
||||||
static String getGitWorkingBranch() {
|
static String getGitWorkingBranch() {
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.3.50'
|
ext.kotlin_version = '1.3.72'
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.5.1'
|
classpath 'com.android.tools.build:gradle:3.6.3'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
|
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,6 @@
|
||||||
|
#Fri May 01 19:39:41 CEST 2020
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
|
||||||
|
|
Loading…
Reference in a new issue