From df75678288b7234b1fdfde37b55ce890b0d2f172 Mon Sep 17 00:00:00 2001
From: gfan <gfan@google.com>
Date: Tue, 9 Jun 2020 15:02:09 -0700
Subject: [PATCH 1/2] Update DataAccessAuditing sample for Android API-level 30

---
 DataAccessAuditingKotlin/app/build.gradle               | 8 ++++----
 DataAccessAuditingKotlin/thirdPartyLibrary/build.gradle | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DataAccessAuditingKotlin/app/build.gradle b/DataAccessAuditingKotlin/app/build.gradle
index 7853d41..766be77 100644
--- a/DataAccessAuditingKotlin/app/build.gradle
+++ b/DataAccessAuditingKotlin/app/build.gradle
@@ -19,13 +19,13 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 'android-R'
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "com.example.android.dataaccessauditingkotlin"
-        minSdkVersion 'R'
-        targetSdkVersion 'R'
+        minSdkVersion 30
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
diff --git a/DataAccessAuditingKotlin/thirdPartyLibrary/build.gradle b/DataAccessAuditingKotlin/thirdPartyLibrary/build.gradle
index 61d068d..c9b5544 100644
--- a/DataAccessAuditingKotlin/thirdPartyLibrary/build.gradle
+++ b/DataAccessAuditingKotlin/thirdPartyLibrary/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 'android-R'
-    buildToolsVersion "30.0.0 rc2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.0"
 
     defaultConfig {
-        minSdkVersion 'R'
-        targetSdkVersion 'R'
+        minSdkVersion 30
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 

From 24f0a443ee9c5656e85cc5e259daaf94fb9dc3f5 Mon Sep 17 00:00:00 2001
From: gfan <gfan@google.com>
Date: Wed, 10 Jun 2020 11:10:54 -0700
Subject: [PATCH 2/2] minor update to android gradle plugin 4.0

---
 DataAccessAuditingKotlin/build.gradle                         | 4 ++--
 .../gradle/wrapper/gradle-wrapper.properties                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DataAccessAuditingKotlin/build.gradle b/DataAccessAuditingKotlin/build.gradle
index a3de5da..9379113 100644
--- a/DataAccessAuditingKotlin/build.gradle
+++ b/DataAccessAuditingKotlin/build.gradle
@@ -16,13 +16,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.71'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/DataAccessAuditingKotlin/gradle/wrapper/gradle-wrapper.properties b/DataAccessAuditingKotlin/gradle/wrapper/gradle-wrapper.properties
index 2fc3679..397cb20 100644
--- a/DataAccessAuditingKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/DataAccessAuditingKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 26 07:44:11 PDT 2020
+#Wed Jun 10 11:09:37 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip