Bump AOSP versions for gradle build

This commit is contained in:
Torsten Grote 2020-09-09 16:46:30 -03:00 committed by Chirayu Desai
parent ca309df03d
commit 415b5729d5
3 changed files with 10 additions and 9 deletions

View file

@ -6,8 +6,8 @@ jdk:
language: android language: android
android: android:
components: components:
- build-tools-29.0.2 - build-tools-30.0.2
- android-29 - android-30
licenses: licenses:
- android-sdk-license-.+ - android-sdk-license-.+

View file

@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 29 compileSdkVersion 30
buildToolsVersion '29.0.2' // adapt in .travis.yaml if changed here buildToolsVersion '30.0.2' // adapt in .travis.yaml if changed here
defaultConfig { defaultConfig {
minSdkVersion 29 minSdkVersion 30
targetSdkVersion 29 targetSdkVersion 30
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments disableAnalytics: 'true' testInstrumentationRunnerArguments disableAnalytics: 'true'
} }

View file

@ -3,7 +3,9 @@
buildscript { buildscript {
// 1.3.21 Android 10 // 1.3.21 Android 10
// 1.3.72 AOSP master (2020-08) // 1.3.61 Android 11
// Check:
// https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-11.0.0_r3/build.txt
ext.kotlin_version = '1.3.61' ext.kotlin_version = '1.3.61'
repositories { repositories {
@ -11,8 +13,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
// newer versions require us to remove targetSdkVersion from Manifest classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong