Skip to content

Commit 0209f24

Browse files
Abbondanzometa-codesync[bot]
Abbondanzo
authored and
meta-codesync[bot]
committed
Fix OSS Gradle Kotlin compatibility
Reviewed By: oprisnik Differential Revision: D119223405 fbshipit-source-id: 1a584a4b6bbefe0d2b306662aee5d5b1f777a5dd
1 parent c90d7f0 commit 0209f24

16 files changed

Lines changed: 80 additions & 24 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package com.facebook.fresco.buildsrc
1010
object TestDeps {
1111
const val assertjCore = "org.assertj:assertj-core:2.9.1"
1212

13-
const val junit = "junit:junit:4.12"
13+
const val junit = "junit:junit:4.13.2"
1414

1515
const val mockitoCore = "org.mockito:mockito-core:2.28.2"
1616
const val mockitoInline = "org.mockito:mockito-inline:2.28.2"

‎drawee-span/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

‎imagepipeline-backends/imagepipeline-volley/build.gradle‎

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

1111
apply plugin: 'com.android.library'
12+
apply plugin: 'kotlin-android'
13+
14+
kotlin {
15+
jvmToolchain(11)
16+
}
1217

1318
dependencies {
1419
compileOnly Deps.inferAnnotation

‎memory-types/ashmem/build.gradle‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ import com.facebook.fresco.buildsrc.Deps
99
import com.facebook.fresco.buildsrc.TestDeps
1010

1111
apply plugin: 'com.android.library'
12+
apply plugin: 'kotlin-android'
13+
14+
kotlin {
15+
jvmToolchain(11)
16+
}
1217

1318
dependencies {
1419
compileOnly Deps.inferAnnotation
@@ -19,7 +24,7 @@ dependencies {
1924
implementation project(':imagepipeline')
2025

2126
testCompileOnly Deps.inferAnnotation
22-
27+
2328
testImplementation TestDeps.junit
2429
testImplementation TestDeps.assertjCore
2530
testImplementation TestDeps.mockitoCore

‎memory-types/nativememory/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

‎mockito-config/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import com.facebook.fresco.buildsrc.Deps
99
import com.facebook.fresco.buildsrc.TestDeps
1010

1111
apply plugin: 'java'
12+
apply plugin: 'kotlin'
1213

13-
java {
14-
toolchain {
15-
languageVersion.set(JavaLanguageVersion.of(11))
16-
}
14+
kotlin {
15+
jvmToolchain(11)
1716
}
1817

1918
dependencies {

‎samples/animation2/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.SampleDeps
1111

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

1419
dependencies {
1520
compileOnly Deps.jsr305

‎samples/gestures/build.gradle‎

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

1313
apply plugin: 'com.android.library'
14+
apply plugin: 'kotlin-android'
15+
16+
kotlin {
17+
jvmToolchain(11)
18+
}
1419

1520
dependencies {
1621
compileOnly Deps.inferAnnotation

‎samples/scrollperf/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ import com.facebook.fresco.buildsrc.SampleDeps
1212
import com.facebook.fresco.buildsrc.TestDeps
1313

1414
apply plugin: 'com.android.application'
15+
apply plugin: 'kotlin-android'
16+
17+
kotlin {
18+
jvmToolchain(11)
19+
}
1520

1621
android {
1722
ndkVersion GradleDeps.Native.version

‎samples/zoomable/build.gradle‎

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

1111
apply plugin: 'com.android.library'
12+
apply plugin: 'kotlin-android'
13+
14+
kotlin {
15+
jvmToolchain(11)
16+
}
1217

1318
dependencies {
1419
compileOnly Deps.inferAnnotation

0 commit comments

Comments
 (0)