From a685620a370d509e35c4043c2830b95002469b36 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Fri, 19 Jan 2018 20:37:04 +0000
Subject: [PATCH] Update gradle and add kotlin support

---
 app/build.gradle | 8 ++++++++
 build.gradle     | 5 ++++-
 cert4android     | 2 +-
 ical4android     | 2 +-
 vcard4android    | 2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 26b2d11d..38d41027 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,6 +7,13 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+kapt {
+    generateStubs = true
+}
 
 android {
     compileSdkVersion 27
@@ -133,6 +140,7 @@ dependencies {
     compile 'io.requery:requery-android:1.5.0'
     compile 'io.requery:requery-kotlin:1.5.0'
     annotationProcessor 'io.requery:requery-processor:1.5.0'
+    kapt 'io.requery:requery-processor:1.5.0'
 
     compile group: 'com.madgag.spongycastle', name: 'core', version: '1.54.0.0'
     compile group: 'com.madgag.spongycastle', name: 'prov', version: '1.54.0.0'
diff --git a/build.gradle b/build.gradle
index 0ae991f1..e4d46960 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,12 +8,15 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.2.20'
+
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
diff --git a/cert4android b/cert4android
index e8a95719..90fcdc85 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit e8a95719e581749997614d614cb6bf36d43fd7b7
+Subproject commit 90fcdc8532a277dfdf8f3f6451a21b3fa5b49e0b
diff --git a/ical4android b/ical4android
index 92ff8d06..532d4fcd 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit 92ff8d06148737bb35e5ace9a9538943f9bdc81f
+Subproject commit 532d4fcd02ba3a398dcdfdcd1118fb66880b25b8
diff --git a/vcard4android b/vcard4android
index 42825421..d5f7d318 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 42825421c620ec01256f4d3a00030aabe64efca8
+Subproject commit d5f7d31887c68a47af3df491f5dca1f307144bf9