More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjsir911 wants to merge 13 commits into
base:master
Choose a base branch
from
Open

More accessible build process #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ee37ec4
Upgrade gradle version
mjsir911 May 20, 2019
5595f12
Update android support version
mjsir911 May 20, 2019
fc772fb
/rootProject.ext.buildToolsVersion/d
mjsir911 May 20, 2019
8f4fd7b
Upgrade butterknife 8.5.1 -> 8.8.1
mjsir911 May 20, 2019
3103db8
s/armeabi/armeabi-v7a
mjsir911 May 20, 2019
5a37712
Don't abort on lintoptions error
mjsir911 May 20, 2019
681b73e
Transition to using jchar instead of char16_t
mjsir911 May 20, 2019
c826d2e
fixup! Don't abort on lintoptions error
mjsir911 May 20, 2019
0349aab
Bump materials-dialog version to fix double dependency
mjsir911 May 20, 2019
f1aaa1b
squash! Upgrade gradle version
mjsir911 May 20, 2019
707e2db
Remove Android.mk from source files
mjsir911 May 20, 2019
bdccbc7
Remove enableAapt2 due to deprecation
mjsir911 May 20, 2019
e415ef6
Remove local.properties and rely on $ANDROID_HOME
mjsir911 May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties
16 changes: 4 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
}
}
Expand All@@ -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}"
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false
12 changes: 0 additions & 12 deletions local.properties
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion qpypluginman/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
6 changes: 4 additions & 2 deletions qpysdk/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
versionName "1.0"

ndk {
abiFilters 'armeabi'
abiFilters 'armeabi-v7a'
}
}
buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
}

}
lintOptions {
abortOnError false
}
}

dependencies {
Expand Down
4 changes: 3 additions & 1 deletion qpysl4a/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
dataBinding {
enabled = true
}
lintOptions {
abortOnError false
}
}

dependencies {
Expand Down
13 changes: 7 additions & 6 deletions qpython/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
versionName "1.0"

ndk {
abiFilters 'armeabi'
abiFilters 'armeabi-v7a'
}

multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
jniLibs.srcDirs = ['libs']
}
}
lintOptions {
abortOnError false
}
}


Expand All@@ -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
Expand All@@ -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
Expand Down
1 change: 0 additions & 1 deletion qpython/src/main/jni/Android.mk
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
-llog \

LOCAL_SRC_FILES := \
Android.mk \
common.cpp \
fileCompat.cpp \
termExec.cpp \
Expand Down
1 change: 0 additions & 1 deletion termemulator/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
11 changes: 1 addition & 10 deletions termexec/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
}
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
}
}

Expand Down
4 changes: 1 addition & 3 deletions termexec/src/main/jni/process.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
String8() {
Expand All@@ -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);
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
More accessible build process#173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

mjsir911
wants to merge
13
commits into

base:master
Choose a base branch

from

 Open


More accessible build process
#173
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
ee37ec4

Upgrade gradle version


mjsir911 May 20, 2019
5595f12

Update android support version


mjsir911 May 20, 2019
fc772fb

/rootProject.ext.buildToolsVersion/d


mjsir911 May 20, 2019
8f4fd7b

Upgrade butterknife 8.5.1 -> 8.8.1


mjsir911 May 20, 2019
3103db8

s/armeabi/armeabi-v7a


mjsir911 May 20, 2019
5a37712

Don't abort on lintoptions error


mjsir911 May 20, 2019
681b73e

Transition to using jchar instead of char16_t


mjsir911 May 20, 2019
c826d2e

fixup! Don't abort on lintoptions error


mjsir911 May 20, 2019
0349aab

Bump materials-dialog version to fix double dependency


mjsir911 May 20, 2019
f1aaa1b

squash! Upgrade gradle version


mjsir911 May 20, 2019
707e2db

Remove Android.mk from source files


mjsir911 May 20, 2019
bdccbc7

Remove enableAapt2 due to deprecation


mjsir911 May 20, 2019
e415ef6

Remove local.properties and rely on $ANDROID_HOME


mjsir911 May 20, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,3 +5,4 @@ build
gradle
.DS_Store
*.pyc
local.properties

16 changes: 4 additions & 12 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 }
}
Expand All@@ -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}"
Expand Down

1 change: 0 additions & 1 deletion
gradle.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,3 @@
org.gradle.jvmargs=-Xmx2048m
#android.useDeprecatedNdk=true
org.gradle.daemon=true
android.enableAapt2=false

12 changes: 0 additions & 12 deletions
local.properties

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
qpypluginman/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

6 changes: 4 additions & 2 deletions
qpysdk/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand All@@ -11,7 +10,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }
 }
 buildTypes {
Expand All@@ -26,6 +25,9 @@ android {
 }

 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

4 changes: 3 additions & 1 deletion
qpysl4a/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand DownExpand Up@@ -35,6 +34,9 @@ android {
 dataBinding {
 enabled = true
 }
 lintOptions {
 abortOnError false
 }
}

dependencies {
Expand Down

13 changes: 7 additions & 6 deletions
qpython/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
Expand All@@ -16,7 +14,7 @@ android {
 versionName "1.0"

 ndk {
 abiFilters 'armeabi'
 abiFilters 'armeabi-v7a'
 }

 multiDexEnabled true
Expand DownExpand Up@@ -48,6 +46,9 @@ android {
 jniLibs.srcDirs = ['libs']
 }
 }
 lintOptions {
 abortOnError false
 }
}


Expand All@@ -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
Expand All@@ -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
Expand Down

1 change: 0 additions & 1 deletion
qpython/src/main/jni/Android.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ LOCAL_LDLIBS := \
	-llog \

LOCAL_SRC_FILES := \
	Android.mk \
	common.cpp \
	fileCompat.cpp \
	termExec.cpp \
Expand Down

1 change: 0 additions & 1 deletion
termemulator/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
 compileSdkVersion rootProject.ext.compileSdkVersion
 buildToolsVersion rootProject.ext.buildToolsVersion

 defaultConfig {
 minSdkVersion rootProject.ext.minSdkVersion
Expand Down

11 changes: 1 addition & 10 deletions
termexec/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
buildscript {
 repositories {
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:3.0.1'
 }
}
apply plugin: 'com.android.library'

repositories {
Expand All@@ -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'
 }
 }

Expand Down

4 changes: 1 addition & 3 deletions
termexec/src/main/jni/process.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,6 @@
#include <termios.h>
#include <signal.h>

typedef unsigned short char16_t;

class String8 {
public:
 String8() {
Expand All@@ -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);
 }
Expand Down