From 97de4bcfcf01d3dd0a391e58970dd845a77cd88b Mon Sep 17 00:00:00 2001
From: shiftrot <shiftrot@gmail.com>
Date: Sun, 9 Jun 2019 09:47:49 +0900
Subject: [PATCH] Update build tools

---
 .gitignore                               |  1 +
 build.gradle                             | 10 +++++++++-
 emulatorview/build.gradle                | 13 +++++++++----
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 libtermexec/build.gradle                 | 17 +++++++++++++----
 term/build.gradle                        | 21 ++++++++++++++++-----
 6 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0c70054..ddd03799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ obj/
 bin/
 gen/
 out/
+.cxx/
 
 # Gradle files
 .gradle/
diff --git a/build.gradle b/build.gradle
index f9be5a12..026f0db4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,16 @@ buildscript {
         jcenter()
         google()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.0-beta04'
     }
+
+    ext.versions = [
+            'compileSdk': 29,
+            'minSdk'    : 16,
+            'targetSdk' : 28
+    ]
 }
 
 allprojects {
@@ -14,6 +21,7 @@ allprojects {
         jcenter()
         google()
     }
+
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) {
 //            options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
diff --git a/emulatorview/build.gradle b/emulatorview/build.gradle
index 19c91b8a..e0b80d7e 100644
--- a/emulatorview/build.gradle
+++ b/emulatorview/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
     }
 
     buildTypes {
@@ -14,9 +14,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.annotation:annotation:1.0.2'
+    implementation 'androidx.annotation:annotation:1.1.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 760f0177..510bcad6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 18 07:29:34 JST 2019
+#Tue Jun 11 00:35:26 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/libtermexec/build.gradle b/libtermexec/build.gradle
index af5ac5f6..52435c95 100644
--- a/libtermexec/build.gradle
+++ b/libtermexec/build.gradle
@@ -1,12 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
+    }
 
+    defaultConfig {
         externalNativeBuild {
             ndkBuild {
                 arguments '-C', 'src/main', '-j', Runtime.runtime.availableProcessors() + ''
@@ -27,11 +29,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
 
+dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.annotation:annotation:1.0.2'
+    implementation 'androidx.annotation:annotation:1.1.0'
 }
diff --git a/term/build.gradle b/term/build.gradle
index f9206604..67a3bb27 100644
--- a/term/build.gradle
+++ b/term/build.gradle
@@ -4,13 +4,16 @@ repositories {
 }
 
 import java.text.SimpleDateFormat
+
 android {
-    compileSdkVersion 29
+    compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
+    }
 
+    defaultConfig {
         versionName = "1.0.0"
         versionCode 1
 
@@ -61,14 +64,22 @@ android {
             applicationId "com.droidvim"
         }
     }
+
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.annotation:annotation:1.0.2'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0-beta01'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0-beta02'
     implementation project(':emulatorview')
     implementation project(':libtermexec')
+}
+
+dependencies {
     implementation 'org.apache.commons:commons-compress:1.18'
     implementation 'commons-io:commons-io:2.6'
     implementation 'org.tukaani:xz:1.8'