Skip to content

Commit 9999628

Browse files
committed
Update AS
1 parent 4acd788 commit 9999628

File tree

304 files changed

+171
-60477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+171
-60477
lines changed

build.gradle

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ buildscript {
1010
repositories {
1111
jcenter()
1212
mavenCentral()
13+
google()
1314
}
1415
dependencies {
15-
classpath 'com.android.tools.build:gradle:2.3.3'
16+
classpath 'com.android.tools.build:gradle:3.0.1'
1617
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
1718
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
1819
classpath "io.realm:realm-gradle-plugin:1.1.1"
@@ -26,6 +27,7 @@ allprojects {
2627
jcenter()
2728
maven { url "https://jitpack.io" }
2829
maven { url 'https://dl.bintray.com/azeesoft/maven' }
30+
google()
2931
}
3032
}
3133

@@ -42,3 +44,28 @@ subprojects {
4244
&& androidHome.canWrite())
4345
apply plugin: 'android-sdk-manager'
4446
}
47+
48+
49+
def supportVersion = "26.0.2"
50+
def rxVersion = "1.2.1"
51+
52+
ext {
53+
minSdkVersion = 15
54+
targetSdkVersion = 26
55+
compileSdkVersion = 26
56+
buildToolsVersion = '26.0.2'
57+
58+
libSupportV7 = "com.android.support:appcompat-v7:${supportVersion}"
59+
libSupportV4 = "com.android.support:support-v4:${supportVersion}"
60+
libSupportAnnotation = "com.android.support:support-annotations:${supportVersion}"
61+
libSupportCardView = "com.android.support:cardview-v7:${supportVersion}"
62+
63+
libSupportDesign = "com.android.support:design:${supportVersion}"
64+
libGuava = "com.google.guava:guava:18.0"
65+
libOkHttp3 = "com.squareup.okhttp3:okhttp:3.4.0"
66+
67+
libRxJava = "io.reactivex:rxandroid:${rxVersion}"
68+
libRxAndroid = "io.reactivex:rxjava:${rxVersion}"
69+
70+
71+
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
# org.gradle.parallel=true
1515
#Sun May 29 21:58:12 CST 2016
1616
org.gradle.jvmargs=-Xmx2048m
17-
android.useDeprecatedNdk=true
17+
#android.useDeprecatedNdk=true
1818
org.gradle.daemon=true
19+
android.enableAapt2=false

local.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
# Location of the SDK. This is only used by Gradle.
88
# For customization when using a Version Control System, please read the
99
# header note.
10-
#Wed Mar 22 13:38:36 CST 2017
10+
#Tue Jan 23 17:37:56 CST 2018
11+
ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle
1112
sdk.dir=/Users/yanhecun/Library/Android/sdk
12-
ndk.dir=/Users/yanhecun/Develop/android-ndk-r10e

qpypluginman/build.gradle

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '25.0.0'
4+
compileSdkVersion rootProject.ext.compileSdkVersion
5+
buildToolsVersion rootProject.ext.buildToolsVersion
66

77
defaultConfig {
8-
minSdkVersion 15
9-
targetSdkVersion 23
8+
minSdkVersion rootProject.ext.minSdkVersion
9+
targetSdkVersion rootProject.ext.targetSdkVersion
1010
versionCode 1
1111
versionName "1.0"
1212
}
13+
14+
1315
buildTypes {
1416
release {
1517
minifyEnabled false
@@ -21,9 +23,12 @@ android {
2123
dependencies {
2224
compile fileTree(include: ['*.jar'], dir: 'libs')
2325
testCompile 'junit:junit:4.12'
24-
compile 'com.squareup.okhttp3:okhttp:3.4.0'
25-
compile 'io.reactivex:rxandroid:1.2.1'
26-
compile 'io.reactivex:rxjava:1.1.6'
27-
compile 'com.android.support:support-v4:23.4.0'
26+
compile rootProject.ext.libRxJava
27+
compile rootProject.ext.libRxAndroid
28+
2829
compile 'com.liulishuo.filedownloader:library:0.3.5'
30+
compile rootProject.ext.libSupportV4
31+
compile rootProject.ext.libOkHttp3
32+
33+
2934
}

qpysdk/build.gradle

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '25.0.0'
4+
compileSdkVersion rootProject.ext.compileSdkVersion
5+
buildToolsVersion rootProject.ext.buildToolsVersion
66

77
defaultConfig {
8-
minSdkVersion 15
9-
targetSdkVersion 23
8+
minSdkVersion rootProject.ext.minSdkVersion
9+
targetSdkVersion rootProject.ext.targetSdkVersion
1010
versionCode 1
1111
versionName "1.0"
1212

1313
ndk {
14-
moduleName "com_googlecode_android_scripting_Exec"
15-
ldLibs "log"
14+
abiFilters 'armeabi'
1615
}
1716
}
1817
buildTypes {
@@ -21,10 +20,16 @@ android {
2120
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2221
}
2322
}
23+
externalNativeBuild {
24+
ndkBuild {
25+
path 'src/main/jni/Android.mk'
26+
}
27+
28+
}
2429
}
2530

2631
dependencies {
2732
//compile fileTree(dir: 'libs', include: ['*.jar'])
2833
compile files('libs/locale_platform.jar')
29-
compile 'com.google.guava:guava:18.0'
34+
compile rootProject.ext.libGuava
3035
}
Binary file not shown.

qpysdk/src/main/assets/private/bin/end.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

qpysdk/src/main/assets/private/bin/init.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

qpysdk/src/main/assets/private/bin/pip

Lines changed: 0 additions & 9 deletions
This file was deleted.

qpysdk/src/main/assets/private/bin/pip_console.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)