From 20dc62fc721fe4f9c301ba09b83686639308b118 Mon Sep 17 00:00:00 2001 From: Robert Stone Date: Thu, 8 Dec 2022 22:34:57 -0800 Subject: [PATCH] Specify gradle build tools version and relocate jvmTarget to top-level config --- application/app/build.gradle | 9 +++------ application/donations/build.gradle | 1 + application/live-plot-graph/build.gradle | 2 ++ application/mediadb/build.gradle | 3 ++- application/moviepedia/build.gradle | 3 +-- application/resources/build.gradle | 2 +- application/television/build.gradle | 5 +++-- application/tools/build.gradle | 3 +-- application/vlc-android/build.gradle | 4 +--- build.gradle | 2 ++ medialibrary/build.gradle | 2 ++ 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/application/app/build.gradle b/application/app/build.gradle index f578e62ed..3272b6dac 100644 --- a/application/app/build.gradle +++ b/application/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' + android { compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } packagingOptions { jniLibs { pickFirsts += ['lib/armeabi-v7a/libc++_shared.so', 'lib/armeabi/libc++_shared.so', 'lib/arm64-v8a/libc++_shared.so', 'lib/x86/libc++_shared.so', 'lib/x86_64/libc++_shared.so'] @@ -22,11 +22,8 @@ android { enabled = true } - compileSdkVersion rootProject.ext.compileSdkVersion - flavorDimensions "abi" - defaultConfig { applicationId rootProject.ext.appId minSdkVersion rootProject.ext.minSdkVersion diff --git a/application/donations/build.gradle b/application/donations/build.gradle index a50aec063..295a64c48 100644 --- a/application/donations/build.gradle +++ b/application/donations/build.gradle @@ -27,6 +27,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion dataBinding { enabled = true diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle index 407717a93..148b31246 100644 --- a/application/live-plot-graph/build.gradle +++ b/application/live-plot-graph/build.gradle @@ -24,8 +24,10 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' + android { compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle index 61c64912b..215938d42 100644 --- a/application/mediadb/build.gradle +++ b/application/mediadb/build.gradle @@ -25,10 +25,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' + android { compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion - kotlinOptions.jvmTarget = "1.8" packagingOptions { jniLibs { pickFirsts += ['**/*.so'] diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle index a59963df2..d848df643 100644 --- a/application/moviepedia/build.gradle +++ b/application/moviepedia/build.gradle @@ -4,8 +4,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion rootProject.ext.compileSdkVersion - - kotlinOptions.jvmTarget = "1.8" + buildToolsVersion rootProject.ext.buildToolsVersion dataBinding { enabled = true diff --git a/application/resources/build.gradle b/application/resources/build.gradle index e550feb9b..54e89b194 100644 --- a/application/resources/build.gradle +++ b/application/resources/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion - kotlinOptions.jvmTarget = "1.8" packagingOptions { jniLibs { pickFirsts += ['**/*.so'] diff --git a/application/television/build.gradle b/application/television/build.gradle index cd7bf0468..1baee141a 100644 --- a/application/television/build.gradle +++ b/application/television/build.gradle @@ -2,16 +2,17 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-parcelize' + android { compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + packagingOptions { jniLibs { pickFirsts += ['**/*.so'] } } - kotlinOptions.jvmTarget = "1.8" - viewBinding.enabled = true dataBinding.enabled = true diff --git a/application/tools/build.gradle b/application/tools/build.gradle index bf01bfc6f..e870e2cad 100644 --- a/application/tools/build.gradle +++ b/application/tools/build.gradle @@ -3,8 +3,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.compileSdkVersion - - kotlinOptions.jvmTarget = "1.8" + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle index acc4d0366..e737e2287 100644 --- a/application/vlc-android/build.gradle +++ b/application/vlc-android/build.gradle @@ -4,10 +4,8 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-parcelize' android { - - kotlinOptions.jvmTarget = "1.8" - compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion dataBinding { enabled = true diff --git a/build.gradle b/build.gradle index 461f03463..3a30088ab 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,7 @@ allprojects { } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn'] } } @@ -46,6 +47,7 @@ ext { minSdkVersion = 17 targetSdkVersion = 33 compileSdkVersion = 33 + buildToolsVersion = '33.0.1' androidxLegacyVersion = '1.0.0' androidxCoreVersion = '1.7.0' appCompatVersion = '1.4.1' diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle index d1e71ab3a..e99ad94fd 100644 --- a/medialibrary/build.gradle +++ b/medialibrary/build.gradle @@ -33,6 +33,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion