Skip to content

Commit 0622048

Browse files
committed
Merge upstream/dev into dev
2 parents 62804be + cb0a012 commit 0622048

43 files changed

Lines changed: 58 additions & 2415 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/build.gradle

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
minSdk 21
1717
//noinspection ExpiredTargetSdkVersion
1818
targetSdk 33
19-
versionCode 1095
20-
versionName "4.9.0"
19+
versionCode 1097
20+
versionName "4.9.2"
2121
archivesBaseName = 'PipePipe_' + versionName
2222

2323
multiDexEnabled true
@@ -108,10 +108,6 @@ android {
108108
jvmTarget = JavaVersion.VERSION_11
109109
}
110110

111-
sourceSets {
112-
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
113-
}
114-
115111
buildFeatures {
116112
viewBinding true
117113
}
@@ -141,8 +137,6 @@ ext {
141137

142138
leakCanaryVersion = '2.10'
143139
stethoVersion = '1.6.0'
144-
mockitoVersion = '4.0.0'
145-
assertJVersion = '3.22.0'
146140
abiCodes = ['armeabi-v7a': 1, 'x86': 2, 'x86_64': 3, 'arm64-v8a': 4]
147141
}
148142

@@ -323,16 +317,6 @@ dependencies {
323317
debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
324318
debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
325319

326-
/** Testing **/
327-
testImplementation 'junit:junit:4.13.2'
328-
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
329-
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
330-
331-
androidTestImplementation "androidx.test.ext:junit:1.1.3"
332-
androidTestImplementation "androidx.test:runner:1.4.0"
333-
androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
334-
androidTestImplementation "org.assertj:assertj-core:${assertJVersion}"
335-
336320
// implementation 'com.arthenica:ffmpeg-kit-https:6.0-2.LTS'
337321
implementation project(':ffmpeg')
338322
implementation 'com.arthenica:smart-exception-java:0.2.1'

app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt

Lines changed: 0 additions & 135 deletions
This file was deleted.

app/src/androidTest/java/org/schabi/newpipe/error/ErrorInfoTest.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)