Minor updates to gradle files for compatibility with ndk 17.

jeremymarch · jeremymarch · commit 959baaab885e · 2018-05-09T02:00:11.000-04:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'com.android.application'
             minSdkVersion 16
             targetSdkVersion 27
             ndk {
-                abiFilters "armeabi-v7a", "x86", "armeabi", "mips", "arm64-v8a", "x86_64", "mips64"
+                abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" //, "mips64", "armeabi", "mips"
             }
             externalNativeBuild {
                 cmake {
diff --git a/app/src/main/java/com/philolog/hoplitekeyboard/HopliteKeyboard.java b/app/src/main/java/com/philolog/hoplitekeyboard/HopliteKeyboard.java
@@ -129,7 +129,6 @@ private IBinder getToken() {
         return window.getAttributes().token;
     }
 
-
     @Override
     public void onKey(int primaryCode, int[] keyCodes) {
         InputConnection ic = getCurrentInputConnection();
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         //classpath 'com.android.tools.build:gradle-experimental:0.11.0-alpha2'
         //classpath 'com.android.tools.build:gradle-experimental:0.11.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.2'

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ apply plugin: 'com.android.application'`
`11`	`11`	`minSdkVersion 16`
`12`	`12`	`targetSdkVersion 27`
`13`	`13`	`ndk {`
`14`		`- abiFilters "armeabi-v7a", "x86", "armeabi", "mips", "arm64-v8a", "x86_64", "mips64"`
	`14`	`+ abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" //, "mips64", "armeabi", "mips"`
`15`	`15`	`}`
`16`	`16`	`externalNativeBuild {`
`17`	`17`	`cmake {`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ private IBinder getToken() {`
`129`	`129`	`return window.getAttributes().token;`
`130`	`130`	`}`
`131`	`131`
`132`		`-`
`133`	`132`	`@Override`
`134`	`133`	`public void onKey(int primaryCode, int[] keyCodes) {`
`135`	`134`	`InputConnection ic = getCurrentInputConnection();`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.1.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.1.2'`
`10`	`10`	`//classpath 'com.android.tools.build:gradle-experimental:0.11.0-alpha2'`
`11`	`11`	`//classpath 'com.android.tools.build:gradle-experimental:0.11.0'`
`12`	`12`	`classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.2'`