From 415b5729d5136ab1f08b0b92d8b73ee6b16c3c55 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 9 Sep 2020 16:46:30 -0300
Subject: [PATCH] Bump AOSP versions for gradle build

---
 .travis.yml      | 4 ++--
 app/build.gradle | 8 ++++----
 build.gradle     | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa16c9cc..82ab682e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ jdk:
 language: android
 android:
   components:
-    - build-tools-29.0.2
-    - android-29
+    - build-tools-30.0.2
+    - android-30
 
 licenses:
   - android-sdk-license-.+
diff --git a/app/build.gradle b/app/build.gradle
index b2a76cf4..c2303a57 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
 
 android {
 
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'  // adapt in .travis.yaml if changed here
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'  // adapt in .travis.yaml if changed here
 
     defaultConfig {
-        minSdkVersion 29
-        targetSdkVersion 29
+        minSdkVersion 30
+        targetSdkVersion 30
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
     }
diff --git a/build.gradle b/build.gradle
index 449e85d4..3d1aca98 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,9 @@
 buildscript {
 
     // 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'
 
     repositories {
@@ -11,8 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        // newer versions require us to remove targetSdkVersion from Manifest
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong