Upgrade Kotlin to 1.8.20 (#4753)
Summary: [android] Upgrade Kotlin to 1.8.20 The additional source/target settings should hopefully no longer be necessary with AGP 8.1: https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support Pull Request resolved: https://github.com/facebook/flipper/pull/4753 Test Plan: - CI - Build sample app - AS sync --- Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/flipper/pull/4753). * https://github.com/facebook/flipper/issues/4759 * https://github.com/facebook/flipper/issues/4758 * https://github.com/facebook/flipper/issues/4757 * https://github.com/facebook/flipper/issues/4756 * https://github.com/facebook/flipper/issues/4755 * https://github.com/facebook/flipper/issues/4754 * __->__ https://github.com/facebook/flipper/issues/4753 * https://github.com/facebook/flipper/issues/4752 * https://github.com/facebook/flipper/issues/4751 Reviewed By: ivanmisuno Differential Revision: D46068906 Pulled By: passy fbshipit-source-id: 93da60ebfe2ec590ef88ea1936fcfd5257699cc7
This commit is contained in:
committed by
Facebook GitHub Bot
parent
499fd6b6cd
commit
65f28ecdbe
@@ -48,6 +48,11 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
targetCompatibility rootProject.javaTargetVersion
|
||||
sourceCompatibility rootProject.javaTargetVersion
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
prefab true
|
||||
}
|
||||
|
||||
@@ -19,6 +19,11 @@ android {
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
targetCompatibility rootProject.javaTargetVersion
|
||||
sourceCompatibility rootProject.javaTargetVersion
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
|
||||
implementation project(':android')
|
||||
|
||||
@@ -18,6 +18,11 @@ android {
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
targetCompatibility rootProject.javaTargetVersion
|
||||
sourceCompatibility rootProject.javaTargetVersion
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly deps.lithoAnnotations
|
||||
implementation project(':android')
|
||||
|
||||
@@ -19,6 +19,11 @@ android {
|
||||
targetSdkVersion rootProject.targetSdkVersion
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
targetCompatibility rootProject.javaTargetVersion
|
||||
sourceCompatibility rootProject.javaTargetVersion
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
|
||||
implementation project(':android')
|
||||
|
||||
@@ -12,6 +12,7 @@ android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
buildToolsVersion rootProject.buildToolsVersion
|
||||
ndkVersion rootProject.ndkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 21
|
||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
@@ -36,8 +37,8 @@ android {
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility rootProject.javaTargetVersion
|
||||
sourceCompatibility rootProject.javaTargetVersion
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
|
||||
@@ -22,8 +22,8 @@ android {
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility rootProject.javaTargetVersion
|
||||
sourceCompatibility rootProject.javaTargetVersion
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
@@ -33,10 +33,6 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
pickFirst "**/libcrypto.so"
|
||||
pickFirst "**/libevent-2.1.so"
|
||||
|
||||
@@ -50,6 +50,7 @@ ext {
|
||||
compileSdkVersion = 31
|
||||
buildToolsVersion = "30.0.3"
|
||||
ndkVersion = "$NDK_VERSION"
|
||||
javaTargetVersion = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
ext.deps = [
|
||||
|
||||
@@ -19,7 +19,7 @@ POM_ISSUES_URL=https://github.com/facebook/flipper/issues/
|
||||
# Shared version numbers
|
||||
LITHO_VERSION=0.44.0
|
||||
ANDROIDX_VERSION=1.3.0
|
||||
KOTLIN_VERSION=1.6.20
|
||||
KOTLIN_VERSION=1.8.20
|
||||
FBJNI_VERSION=0.3.0
|
||||
SOLOADER_VERSION=0.10.4
|
||||
# NDK
|
||||
|
||||
Reference in New Issue
Block a user