Bump AndroidX/Kotlin setup

Summary:
Just a few tweaks to bring AndroidX up-to-date. Required
some fixes to the Kotlin Tutorial as it was throwing
errors about JRE incompatibilities.

Reviewed By: fabiomassimo

Differential Revision: D29761484

fbshipit-source-id: 10cb76115fe7542a60b6e5d14be9c0434e85171c
This commit is contained in:
Pascal Hartig
2021-07-19 03:52:46 -07:00
committed by Facebook GitHub Bot
parent 8124663c5c
commit d676f8f0a6
4 changed files with 13 additions and 13 deletions

View File

@@ -15,7 +15,7 @@ android {
minSdkVersion 21
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
applicationId 'com.facebook.flipper.sample'
targetSdkVersion 28
targetSdkVersion rootProject.targetSdkVersion
}
lintOptions {
@@ -35,8 +35,8 @@ android {
}
compileOptions {
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
}

View File

@@ -11,20 +11,19 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
defaultConfig {
applicationId "com.facebook.flipper.sample.tutorial"
minSdkVersion 23
targetSdkVersion 28
targetSdkVersion rootProject.targetSdkVersion
compileSdkVersion rootProject.compileSdkVersion
versionCode 1
versionName "1.0"
}
compileOptions {
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
@@ -34,6 +33,9 @@ android {
}
}
kotlinOptions {
jvmTarget = "1.8"
}
}
dependencies {