More accessible build process

.gitignore

@@ -5,3 +5,4 @@ build
 gradle
 .DS_Store
 *.pyc
+local.properties

build.gradle

@@ -13,11 +13,11 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
         classpath "io.realm:realm-gradle-plugin:1.1.1"
-        classpath 'com.jakewharton:butterknife-gradle-plugin:8.5.1'
+        classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1'
         classpath "io.realm:realm-gradle-plugin:3.0.0"
     }
 }
@@ -36,24 +36,16 @@ task clean(type: Delete) {
 }
 
 
-subprojects {
-    def androidHome
-
-    if ((androidHome = System.env.'ANDROID_HOME')
-            && (androidHome = androidHome as File).exists()
-            && androidHome.canWrite())
-        apply plugin: 'android-sdk-manager'
-}
+apply plugin: 'android-sdk-manager'
 
 
-def supportVersion = "26.0.2"
+def supportVersion = "26.1.0"
 def rxVersion = "1.2.1"
 
 ext {
     minSdkVersion = 15
     targetSdkVersion = 26
     compileSdkVersion = 26
-    buildToolsVersion = '26.0.2'
 
     libSupportV7 = "com.android.support:appcompat-v7:${supportVersion}"
     libSupportV4 = "com.android.support:support-v4:${supportVersion}"

gradle.properties

@@ -16,4 +16,3 @@
 org.gradle.jvmargs=-Xmx2048m
 #android.useDeprecatedNdk=true
 org.gradle.daemon=true
-android.enableAapt2=false

qpypluginman/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion

qpysdk/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -11,7 +10,7 @@ android {
         versionName "1.0"
 
         ndk {
-            abiFilters 'armeabi'
+            abiFilters 'armeabi-v7a'
         }
     }
     buildTypes {
@@ -26,6 +25,9 @@ android {
         }
 
     }
+    lintOptions {
+      abortOnError false
+    }
 }
 
 dependencies {

qpysl4a/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -35,6 +34,9 @@ android {
     dataBinding {
         enabled = true
     }
+    lintOptions {
+      abortOnError false
+    }
 }
 
 dependencies {

qpython/build.gradle

@@ -1,11 +1,9 @@
 apply plugin: 'com.android.application'
 //apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'realm-android'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -16,7 +14,7 @@ android {
         versionName "1.0"
 
         ndk {
-            abiFilters 'armeabi'
+            abiFilters 'armeabi-v7a'
         }
 
         multiDexEnabled true
@@ -48,6 +46,9 @@ android {
             jniLibs.srcDirs = ['libs']
         }
     }
+    lintOptions {
+      abortOnError false
+    }
 }
 
 
@@ -68,8 +69,8 @@ dependencies {
     //releaseCompile project(path: ':qpysl4a', configuration: 'libraryRelease')
 
     compile 'com.umeng.analytics:analytics:latest.integration'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
     compile rootProject.ext.libSupportDesign
     compile rootProject.ext.libSupportV7
@@ -83,7 +84,7 @@ dependencies {
     compile 'org.apmem.tools:layouts:1.9@aar'
     compile 'com.azeesoft.lib.colorpicker:colorpicker:1.0.8@aar'
     compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
-    compile('com.github.afollestad.material-dialogs:commons:0.8.5.6') { transitive = true }
+    compile('com.github.afollestad.material-dialogs:commons:0.8.5.7') { transitive = true }
     compile 'com.daimajia.numberprogressbar:library:1.2@aar'
     compile rootProject.ext.libRxJava
     compile rootProject.ext.libRxAndroid

qpython/src/main/jni/Android.mk

@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
 	-llog \
 
 LOCAL_SRC_FILES := \
-	Android.mk \
 	common.cpp \
 	fileCompat.cpp \
 	termExec.cpp \

termemulator/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion

termexec/build.gradle

@@ -1,11 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-    }
-}
 apply plugin: 'com.android.library'
 
 repositories {
@@ -14,15 +6,14 @@ repositories {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters 'armeabi'
+            abiFilters 'armeabi-v7a'
         }
     }
 

termexec/src/main/jni/process.cpp

@@ -27,8 +27,6 @@
 #include <termios.h>
 #include <signal.h>
 
-typedef unsigned short char16_t;
-
 class String8 {
 public:
     String8() {
@@ -41,7 +39,7 @@ class String8 {
         }
     }
 
-    void set(const char16_t *o, size_t numChars) {
+    void set(const jchar *o, size_t numChars) {
         if (mString) {
             free(mString);
         }