From 7e740b765c822928ef39c33fcf80539ea6f34f16 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 15 Jan 2021 13:07:13 +0700
Subject: [PATCH 1/2] fix(android/samples): Fix Sentry dependencies

---
 android/Samples/KMSample1/app/build.gradle | 7 +++++--
 android/Samples/KMSample1/build.gradle     | 2 +-
 android/Samples/KMSample2/app/build.gradle | 7 +++++--
 android/Samples/KMSample2/build.gradle     | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/android/Samples/KMSample1/app/build.gradle b/android/Samples/KMSample1/app/build.gradle
index 645cb3f585..c0737f1b2b 100644
--- a/android/Samples/KMSample1/app/build.gradle
+++ b/android/Samples/KMSample1/app/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+    id 'io.sentry.android.gradle'
+}
 
 android {
     compileSdkVersion 29
@@ -40,5 +43,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
     implementation 'com.google.android.material:material:1.2.1'
     api(name: 'keyman-engine', ext: 'aar')
-    implementation 'io.sentry:sentry-android:2.3.0'
+    implementation 'io.sentry:sentry-android:3.1.0'
 }
diff --git a/android/Samples/KMSample1/build.gradle b/android/Samples/KMSample1/build.gradle
index 587e3d747f..522033b204 100644
--- a/android/Samples/KMSample1/build.gradle
+++ b/android/Samples/KMSample1/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'io.sentry:sentry-android:2.0.1'
+        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.36'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/Samples/KMSample2/app/build.gradle b/android/Samples/KMSample2/app/build.gradle
index 1efd687137..2334fe1beb 100644
--- a/android/Samples/KMSample2/app/build.gradle
+++ b/android/Samples/KMSample2/app/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+    id 'io.sentry.android.gradle'
+}
 
 android {
     compileSdkVersion 29
@@ -39,5 +42,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
     implementation 'com.google.android.material:material:1.2.1'
     api (name:'keyman-engine', ext:'aar')
-    implementation 'io.sentry:sentry-android:2.3.0'
+    implementation 'io.sentry:sentry-android:3.1.0'
 }
diff --git a/android/Samples/KMSample2/build.gradle b/android/Samples/KMSample2/build.gradle
index 587e3d747f..522033b204 100644
--- a/android/Samples/KMSample2/build.gradle
+++ b/android/Samples/KMSample2/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'io.sentry:sentry-android:2.0.1'
+        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.36'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From e6ebc22f0b005689ed3b0e73d0f00c7b4d5c92a2 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 18 Jan 2021 16:05:45 +0700
Subject: [PATCH 2/2] fix(android/samples): Update keyboard harness

---
 android/Tests/KeyboardHarness/app/build.gradle | 7 +++++--
 android/Tests/KeyboardHarness/build.gradle     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/Tests/KeyboardHarness/app/build.gradle b/android/Tests/KeyboardHarness/app/build.gradle
index 5cc2e4d704..7a443d8db8 100644
--- a/android/Tests/KeyboardHarness/app/build.gradle
+++ b/android/Tests/KeyboardHarness/app/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+    id 'io.sentry.android.gradle'
+}
 
 ext.rootPath = '../../../'
 apply from: "$rootPath/version.gradle"
@@ -46,5 +49,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
     implementation 'com.google.android.material:material:1.2.1'
     api (name:'keyman-engine', ext:'aar')
-    implementation 'io.sentry:sentry-android:2.3.0'
+    implementation 'io.sentry:sentry-android:3.1.0'
 }
diff --git a/android/Tests/KeyboardHarness/build.gradle b/android/Tests/KeyboardHarness/build.gradle
index 587e3d747f..522033b204 100644
--- a/android/Tests/KeyboardHarness/build.gradle
+++ b/android/Tests/KeyboardHarness/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'io.sentry:sentry-android:2.0.1'
+        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.36'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files