Skip to content

Commit ad5eb53

Browse files
Abbondanzofacebook-github-bot
Abbondanzo
authored and
facebook-github-bot
committed
Fix GH build
Differential Revision: D73127101
1 parent 210c980 commit ad5eb53

File tree

21 files changed

+49
-19
lines changed

21 files changed

+49
-19
lines changed

‎animated-base/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ dependencies {
4040
testImplementation TestDeps.assertjCore
4141
testImplementation TestDeps.junit
4242
testImplementation TestDeps.festAssertCore
43-
testImplementation TestDeps.mockitoInline
44-
testImplementation(TestDeps.Powermock.apiMockito) {
45-
exclude group: 'org.mockito', module: 'mockito-all'
46-
}
43+
testImplementation TestDeps.mockitoCore3
44+
testImplementation TestDeps.mockitoInline3
4745
testImplementation TestDeps.Powermock.moduleJunit4
4846
testImplementation TestDeps.Powermock.moduleJunit4Rule
4947
testImplementation TestDeps.Powermock.classloadingXstream

‎animated-gif-lite/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ kotlin {
1818
dependencies {
1919
compileOnly Deps.inferAnnotation
2020
compileOnly Deps.jsr305
21-
21+
2222
implementation project(':animated-base')
23+
implementation project(':fbcore')
2324
}
2425

2526
android {

‎animated-gif/src/main/jni/gifimage/gif.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <android/bitmap.h>
1111
#include <android/log.h>
12-
#include <angliru/Angliru.h>
1312
#include <jni.h>
1413
#include <unistd.h>
1514
#include <algorithm>
@@ -23,6 +22,12 @@
2322
#include "locks.h"
2423
#include "secure_memcpy.h"
2524

25+
#ifdef __ANGLIRU__
26+
#include <angliru/Angliru.h>
27+
#else
28+
#define __ANGLIRU_SOURCE__
29+
#endif // For Angliru analysis
30+
2631
#if defined(__has_include) && __has_include(<jni/jni_helpers.h>)
2732
#include <jni/jni_helpers.h>
2833
#else

‎buildSrc/src/main/java/com/facebook/fresco/buildsrc/TestDeps.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ object TestDeps {
1313
const val junit = "junit:junit:4.12"
1414

1515
const val mockitoCore = "org.mockito:mockito-core:2.28.2"
16-
1716
const val mockitoInline = "org.mockito:mockito-inline:2.28.2"
1817
const val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:2.2.11"
1918

19+
const val mockitoCore3 = "org.mockito:mockito-core:3.12.4"
20+
const val mockitoInline3 = "org.mockito:mockito-inline:3.12.4"
21+
const val mockitoKotlin3 = "org.mockito.kotlin:mockito-kotlin:3.1.0"
22+
2023
const val festAssertCore = "org.easytesting:fest-assert-core:2.0M10"
2124

2225
const val robolectric = "org.robolectric:robolectric:4.12.2"

‎drawee-span/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies {
2121
implementation project(path: ':imagepipeline-base')
2222
implementation project(':ui-common')
2323
implementation project(':vito:core')
24+
implementation project(':vito:core-impl')
2425
implementation project(':vito:drawee-support')
2526
implementation project(':vito:source')
2627
implementation project(':vito:options')
@@ -29,7 +30,8 @@ dependencies {
2930
testImplementation TestDeps.assertjCore
3031
testImplementation TestDeps.junit
3132
testImplementation TestDeps.festAssertCore
32-
testImplementation TestDeps.mockitoCore
33+
testImplementation TestDeps.mockitoCore3
34+
testImplementation TestDeps.mockitoInline3
3335
testImplementation(TestDeps.robolectric) {
3436
exclude group: 'commons-logging', module: 'commons-logging'
3537
exclude group: 'org.apache.httpcomponents', module: 'httpclient'

‎imagepipeline-base/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,8 @@ dependencies {
3232
testImplementation TestDeps.junit
3333
testImplementation TestDeps.assertjCore
3434
testImplementation TestDeps.festAssertCore
35-
testImplementation TestDeps.mockitoCore
36-
testImplementation(TestDeps.Powermock.apiMockito) {
37-
exclude group: 'org.mockito', module: 'mockito-all'
38-
}
39-
testImplementation TestDeps.Powermock.moduleJunit4
40-
testImplementation TestDeps.Powermock.moduleJunit4Rule
41-
testImplementation TestDeps.Powermock.classloadingXstream
35+
testImplementation TestDeps.mockitoCore3
36+
testImplementation TestDeps.mockitoInline3
4237
testImplementation(TestDeps.robolectric) {
4338
exclude group: 'commons-logging', module: 'commons-logging'
4439
exclude group: 'org.apache.httpcomponents', module: 'httpclient'

‎imagepipeline-test/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
implementation project(':fbcore')
1616
implementation project(':imagepipeline')
1717
implementation project(':imagepipeline-base')
18+
implementation Deps.inferAnnotation
1819
implementation TestDeps.mockitoCore
1920
}
2021
android {

‎imagepipeline/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ dependencies {
4242
testImplementation TestDeps.assertjCore
4343
testImplementation TestDeps.junit
4444
testImplementation TestDeps.festAssertCore
45-
testImplementation TestDeps.mockitoCore
45+
testImplementation TestDeps.mockitoCore3
46+
testImplementation TestDeps.mockitoInline3
4647
testImplementation(TestDeps.Powermock.apiMockito) {
4748
exclude group: 'org.mockito', module: 'mockito-all'
4849
}

‎memory-types/ashmem/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ dependencies {
1818
implementation project(':fbcore')
1919
implementation project(':imagepipeline')
2020

21+
testCompileOnly Deps.inferAnnotation
22+
2123
testImplementation TestDeps.junit
2224
testImplementation TestDeps.assertjCore
2325
testImplementation TestDeps.mockitoCore

‎memory-types/nativememory/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ dependencies {
2222

2323
implementation Deps.SoLoader.nativeloader
2424

25+
testCompileOnly Deps.inferAnnotation
26+
2527
testImplementation TestDeps.junit
2628
testImplementation TestDeps.assertjCore
2729
testImplementation TestDeps.mockitoCore

‎memory-types/simple/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ dependencies {
1919
implementation project(':imagepipeline')
2020
implementation project(':imagepipeline-native')
2121

22+
testCompileOnly Deps.inferAnnotation
23+
2224
testImplementation TestDeps.junit
2325
testImplementation TestDeps.assertjCore
2426
testImplementation TestDeps.mockitoCore

‎middleware/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dependencies {
3131
compileOnly Deps.jsr305
3232
implementation project(':fbcore')
3333
implementation project(':ui-common')
34+
implementation project(':ui-core')
3435
}
3536

3637
apply plugin: "com.vanniktech.maven.publish"

‎samples/showcase/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ dependencies {
125125
implementation 'com.facebook.keyframes:keyframes:1.0'
126126

127127
implementation project(':ui-common')
128+
implementation project(':urimod')
128129

129130
// Litho
130131
compileOnly Deps.Litho.lithoAnnotations

‎static-webp/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ import com.facebook.fresco.buildsrc.GradleDeps
1010
import com.facebook.fresco.buildsrc.TestDeps
1111

1212
apply plugin: 'com.android.library'
13+
apply plugin: 'kotlin-android'
14+
15+
kotlin {
16+
jvmToolchain(11)
17+
}
1318

1419
dependencies {
1520
compileOnly Deps.inferAnnotation

‎static-webp/src/main/jni/static-webp/webp.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <android/bitmap.h>
1111
#include <android/log.h>
12-
#include <angliru/Angliru.h>
1312
#include <jni.h>
1413
#include <array>
1514
#include <memory>
@@ -19,6 +18,12 @@
1918
#include "webp/decode.h"
2019
#include "webp/demux.h"
2120

21+
#ifdef __ANGLIRU__
22+
#include <angliru/Angliru.h>
23+
#else
24+
#define __ANGLIRU_SOURCE__
25+
#endif // For Angliru analysis
26+
2227
#if defined(__has_include) && __has_include(<jni/jni_helpers.h>)
2328
#include <jni/jni_helpers.h>
2429
#else

‎vito/core-impl/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies {
2222
implementation project(':imagepipeline-base')
2323
implementation project(':middleware')
2424
implementation project(':ui-common')
25+
implementation project(':urimod')
2526
implementation project(':vito:core')
2627
implementation project(':vito:core-common-impl')
2728
implementation project(':vito:options')

‎vito/core/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ dependencies {
3535

3636
testImplementation TestDeps.junit
3737
testImplementation TestDeps.assertjCore
38-
testImplementation TestDeps.mockitoInline
39-
testImplementation TestDeps.mockitoKotlin
38+
testImplementation TestDeps.mockitoCore3
39+
testImplementation TestDeps.mockitoInline3
40+
testImplementation TestDeps.mockitoKotlin3
4041
testImplementation(TestDeps.robolectric) {
4142
exclude group: 'commons-logging', module: 'commons-logging'
4243
exclude group: 'org.apache.httpcomponents', module: 'httpclient'

‎vito/litho-slideshow/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies {
3737
implementation project(':drawee')
3838
implementation project(':fbcore')
3939
implementation project(':ui-common')
40+
implementation project(':urimod')
4041
}
4142

4243
android {

‎vito/textspan/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ dependencies {
4646
implementation project(':vito:provider')
4747
implementation project(':vito:source')
4848
implementation project(':ui-common')
49+
implementation project(':urimod')
4950
}
5051

5152
apply plugin: "com.vanniktech.maven.publish"

‎vito/tools/liveeditor/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
implementation project(':fbcore')
2121
implementation project(':middleware')
2222
implementation project(':ui-common')
23+
implementation project(':urimod')
2324
implementation project(':vito:core')
2425
implementation project(':vito:core-common-impl')
2526
implementation project(':vito:core-impl')

‎vito/view/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ dependencies {
4747
implementation project(':vito:provider')
4848
implementation project(':vito:source')
4949
implementation project(':ui-common')
50+
implementation project(':urimod')
5051
}
5152

5253
apply plugin: "com.vanniktech.maven.publish"

0 commit comments

Comments
 (0)