From 65f28ecdbe9c70d8ccef68ce6582c3e2e39d0244 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Tue, 23 May 2023 10:16:38 -0700 Subject: [PATCH] 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 --- android/build.gradle | 5 +++++ android/plugins/leakcanary2/build.gradle | 5 +++++ android/plugins/litho/build.gradle | 5 +++++ android/plugins/retrofit2-protobuf/build.gradle | 5 +++++ android/sample/build.gradle | 5 +++-- android/tutorial/build.gradle | 8 ++------ build.gradle | 1 + gradle.properties | 2 +- 8 files changed, 27 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e656d0ae6..763ebccef 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -48,6 +48,11 @@ android { } } + compileOptions { + targetCompatibility rootProject.javaTargetVersion + sourceCompatibility rootProject.javaTargetVersion + } + buildFeatures { prefab true } diff --git a/android/plugins/leakcanary2/build.gradle b/android/plugins/leakcanary2/build.gradle index d141f408d..def2cf57d 100644 --- a/android/plugins/leakcanary2/build.gradle +++ b/android/plugins/leakcanary2/build.gradle @@ -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') diff --git a/android/plugins/litho/build.gradle b/android/plugins/litho/build.gradle index 9b8494679..4ca8b0e45 100644 --- a/android/plugins/litho/build.gradle +++ b/android/plugins/litho/build.gradle @@ -18,6 +18,11 @@ android { targetSdkVersion rootProject.targetSdkVersion } + compileOptions { + targetCompatibility rootProject.javaTargetVersion + sourceCompatibility rootProject.javaTargetVersion + } + dependencies { compileOnly deps.lithoAnnotations implementation project(':android') diff --git a/android/plugins/retrofit2-protobuf/build.gradle b/android/plugins/retrofit2-protobuf/build.gradle index b807c0de8..4a4c383e2 100644 --- a/android/plugins/retrofit2-protobuf/build.gradle +++ b/android/plugins/retrofit2-protobuf/build.gradle @@ -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') diff --git a/android/sample/build.gradle b/android/sample/build.gradle index ea77a1b5e..73145eaae 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -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 { diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle index 4f55e38b8..2526f95ec 100644 --- a/android/tutorial/build.gradle +++ b/android/tutorial/build.gradle @@ -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" diff --git a/build.gradle b/build.gradle index d45665b7f..6d0bade47 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,7 @@ ext { compileSdkVersion = 31 buildToolsVersion = "30.0.3" ndkVersion = "$NDK_VERSION" + javaTargetVersion = JavaVersion.VERSION_17 } ext.deps = [ diff --git a/gradle.properties b/gradle.properties index 92340ba69..db061ec28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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