diff --git a/android/sample/build.gradle b/android/sample/build.gradle index 7c2039ac4..d89bead4c 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -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 } } diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle index 59f5041d5..63d28af7b 100644 --- a/android/tutorial/build.gradle +++ b/android/tutorial/build.gradle @@ -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 { diff --git a/build.gradle b/build.gradle index e9a69c9fa..b462032ac 100644 --- a/build.gradle +++ b/build.gradle @@ -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 = [ diff --git a/gradle.properties b/gradle.properties index e03592ec6..6ee0ab7ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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