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:
committed by
Facebook GitHub Bot
parent
8124663c5c
commit
d676f8f0a6
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -46,12 +46,10 @@ subprojects {
|
||||
|
||||
ext {
|
||||
minSdkVersion = 15
|
||||
targetSdkVersion = 29
|
||||
compileSdkVersion = 29
|
||||
targetSdkVersion = 30
|
||||
compileSdkVersion = 30
|
||||
buildToolsVersion = '30.0.2'
|
||||
ndkVersion = '21.3.6528147'
|
||||
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
|
||||
targetCompatibilityVersion = JavaVersion.VERSION_1_7
|
||||
}
|
||||
|
||||
ext.deps = [
|
||||
|
||||
@@ -20,7 +20,7 @@ POM_ISSUES_URL=https://github.com/facebook/flipper/issues/
|
||||
|
||||
# Shared version numbers
|
||||
LITHO_VERSION=0.39.0
|
||||
ANDROIDX_VERSION=1.1.0
|
||||
ANDROIDX_VERSION=1.3.0
|
||||
KOTLIN_VERSION=1.3.72
|
||||
|
||||
# Gradle internals
|
||||
|
||||
Reference in New Issue
Block a user