From ee37ec4160e003a5fd9a4f74be5644f49d11c9fc Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:24:05 -0400 Subject: [PATCH 01/13] Upgrade gradle version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9d8df85a..5639847e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ 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" From 5595f128ee9ab50b535af2b1629f4efd20313e69 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:24:50 -0400 Subject: [PATCH 02/13] Update android support version --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5639847e..30aa51cc 100644 --- a/build.gradle +++ b/build.gradle @@ -46,14 +46,13 @@ subprojects { } -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}" From fc772fb372ef6230185d0075f54bcd331ac934db Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:25:47 -0400 Subject: [PATCH 03/13] /rootProject.ext.buildToolsVersion/d --- qpypluginman/build.gradle | 1 - qpysdk/build.gradle | 1 - qpysl4a/build.gradle | 1 - qpython/build.gradle | 1 - termemulator/build.gradle | 1 - termexec/build.gradle | 1 - 6 files changed, 6 deletions(-) diff --git a/qpypluginman/build.gradle b/qpypluginman/build.gradle index 14449ce0..33cf653f 100644 --- a/qpypluginman/build.gradle +++ b/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 diff --git a/qpysdk/build.gradle b/qpysdk/build.gradle index 44c6b438..f3373919 100644 --- a/qpysdk/build.gradle +++ b/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 diff --git a/qpysl4a/build.gradle b/qpysl4a/build.gradle index 11a2e931..b101de24 100644 --- a/qpysl4a/build.gradle +++ b/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 diff --git a/qpython/build.gradle b/qpython/build.gradle index d883fdbe..517ef381 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'realm-android' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion diff --git a/termemulator/build.gradle b/termemulator/build.gradle index c9d03f6a..a327b54e 100644 --- a/termemulator/build.gradle +++ b/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 diff --git a/termexec/build.gradle b/termexec/build.gradle index 3a4e325b..6ad453d2 100644 --- a/termexec/build.gradle +++ b/termexec/build.gradle @@ -14,7 +14,6 @@ repositories { android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion From 8f4fd7be4c27f6b3724db20925f959b0379881c1 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:26:32 -0400 Subject: [PATCH 04/13] Upgrade butterknife 8.5.1 -> 8.8.1 --- build.gradle | 2 +- qpython/build.gradle | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 30aa51cc..fcbaa402 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { 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" } } diff --git a/qpython/build.gradle b/qpython/build.gradle index 517ef381..9776240d 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' //apply plugin: 'me.tatarka.retrolambda' -apply plugin: 'com.jakewharton.butterknife' apply plugin: 'realm-android' android { @@ -67,8 +66,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 From 3103db8768b31ba268e6f33926f0e730c57020b3 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:26:52 -0400 Subject: [PATCH 05/13] s/armeabi/armeabi-v7a (solution from issue #160) --- qpysdk/build.gradle | 2 +- qpython/build.gradle | 2 +- termexec/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qpysdk/build.gradle b/qpysdk/build.gradle index f3373919..f3e24929 100644 --- a/qpysdk/build.gradle +++ b/qpysdk/build.gradle @@ -10,7 +10,7 @@ android { versionName "1.0" ndk { - abiFilters 'armeabi' + abiFilters 'armeabi-v7a' } } buildTypes { diff --git a/qpython/build.gradle b/qpython/build.gradle index 9776240d..8a635a6f 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -14,7 +14,7 @@ android { versionName "1.0" ndk { - abiFilters 'armeabi' + abiFilters 'armeabi-v7a' } multiDexEnabled true diff --git a/termexec/build.gradle b/termexec/build.gradle index 6ad453d2..2cbd7cf8 100644 --- a/termexec/build.gradle +++ b/termexec/build.gradle @@ -21,7 +21,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters 'armeabi' + abiFilters 'armeabi-v7a' } } From 5a37712672d7ad4ec07344a5129a5c17488b6aec Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:27:27 -0400 Subject: [PATCH 06/13] Don't abort on lintoptions error solution from #160 --- qpysdk/build.gradle | 3 +++ qpysl4a/build.gradle | 3 +++ 2 files changed, 6 insertions(+) diff --git a/qpysdk/build.gradle b/qpysdk/build.gradle index f3e24929..c7474e71 100644 --- a/qpysdk/build.gradle +++ b/qpysdk/build.gradle @@ -25,6 +25,9 @@ android { } } + lintOptions { + abortOnError false + } } dependencies { diff --git a/qpysl4a/build.gradle b/qpysl4a/build.gradle index b101de24..f0036bfd 100644 --- a/qpysl4a/build.gradle +++ b/qpysl4a/build.gradle @@ -34,6 +34,9 @@ android { dataBinding { enabled = true } + lintOptions { + abortOnError false + } } dependencies { From 681b73eee107a18f5cd3f3e65fb57e701195c3cc Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 19 May 2019 23:38:36 -0400 Subject: [PATCH 07/13] Transition to using jchar instead of char16_t --- termexec/src/main/jni/process.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/termexec/src/main/jni/process.cpp b/termexec/src/main/jni/process.cpp index 7f062ce8..1f918bad 100644 --- a/termexec/src/main/jni/process.cpp +++ b/termexec/src/main/jni/process.cpp @@ -27,8 +27,6 @@ #include #include -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); } From c826d2e05848211608602fa5fb5ce73107718760 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Mon, 20 May 2019 00:12:43 -0400 Subject: [PATCH 08/13] fixup! Don't abort on lintoptions error --- qpython/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qpython/build.gradle b/qpython/build.gradle index 8a635a6f..f4d620b0 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -46,6 +46,9 @@ android { jniLibs.srcDirs = ['libs'] } } + lintOptions { + abortOnError false + } } From 0349aab8848c7fdcc2aec31d239c7a33ea0867e8 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Mon, 20 May 2019 11:28:11 -0400 Subject: [PATCH 09/13] Bump materials-dialog version to fix double dependency --- qpython/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpython/build.gradle b/qpython/build.gradle index f4d620b0..55c17af2 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -84,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 From f1aaa1bb112032c6cb0c854f2de2c0b4a3b10e99 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Mon, 20 May 2019 11:39:46 -0400 Subject: [PATCH 10/13] squash! Upgrade gradle version Remove additional gradle dependency from termexec --- termexec/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/termexec/build.gradle b/termexec/build.gradle index 2cbd7cf8..6d9310c0 100644 --- a/termexec/build.gradle +++ b/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 { From 707e2db84fb77fdf6b6efeec3bc2e2588a07dc68 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Mon, 20 May 2019 12:02:00 -0400 Subject: [PATCH 11/13] Remove Android.mk from source files --- qpython/src/main/jni/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/qpython/src/main/jni/Android.mk b/qpython/src/main/jni/Android.mk index 82c230c1..4605e24d 100644 --- a/qpython/src/main/jni/Android.mk +++ b/qpython/src/main/jni/Android.mk @@ -7,7 +7,6 @@ LOCAL_LDLIBS := \ -llog \ LOCAL_SRC_FILES := \ - Android.mk \ common.cpp \ fileCompat.cpp \ termExec.cpp \ From bdccbc792673b7e48ac8726dd97add52884275cf Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Mon, 20 May 2019 12:02:15 -0400 Subject: [PATCH 12/13] Remove enableAapt2 due to deprecation --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6e9a9fd2..84280287 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,3 @@ org.gradle.jvmargs=-Xmx2048m #android.useDeprecatedNdk=true org.gradle.daemon=true -android.enableAapt2=false \ No newline at end of file From e415ef6621bc4e4c683be173d96eba4178cde774 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Mon, 20 May 2019 12:23:19 -0400 Subject: [PATCH 13/13] Remove local.properties and rely on $ANDROID_HOME --- .gitignore | 1 + build.gradle | 9 +-------- local.properties | 12 ------------ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 local.properties diff --git a/.gitignore b/.gitignore index f3579da9..4edfdfff 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ build gradle .DS_Store *.pyc +local.properties diff --git a/build.gradle b/build.gradle index fcbaa402..05098822 100644 --- a/build.gradle +++ b/build.gradle @@ -36,14 +36,7 @@ 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.1.0" diff --git a/local.properties b/local.properties deleted file mode 100644 index 463527d2..00000000 --- a/local.properties +++ /dev/null @@ -1,12 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Tue Jan 23 17:37:56 CST 2018 -ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle -sdk.dir=/Users/yanhecun/Library/Android/sdk