Skip to content

Commit 28a6955

Browse files
committed
New QPython sourcecode
1 parent 1fc94b7 commit 28a6955

File tree

8,975 files changed

+3234623
-106659
lines changed

Some content is hidden

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

8,975 files changed

+3234623
-106659
lines changed

.gitignore

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
*.iml
22
.gradle
33
build
4+
__MACOSX
45
.idea
5-
gradle
6+
keystore
67
.DS_Store
7-
*.pyc
8+
local.properties
9+
*.apk
10+
qbaselib.iml
11+
.*
12+
!/.gitignore
13+
gradle-wrapper.properties
14+
Android.mk
15+
qpython/src/main/jni/python/libpython2.7.b
16+
qpysdk/src/main/obj
17+
values-fr
18+
values-tr
19+
build.gradle.new
20+
captures
21+
old.git
22+
qpysl4a
23+
qbaselib
24+
qftplib

LICENSE

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

README.md

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,29 @@
1-
# QPython Project
2-
<p align="center"><a href="http://www.qpython.org" target="_blank"><img src="http://www.qpython.org/images/bestpython.png"></a></p>
1+
# QPYTHON project
32

4-
Welcome to read the QPython guide!
3+
QPython is a script engine that runs Python on android devices. lt lets your android device run Python scripts and projects. lt contains the Python interpreter,console,editor,and the SL4A Library for Android. lt’s Python on Android!
54

6-
QPython is a script engine that runs Python on android devices. It lets your android device run Python scripts and projects. It contains the Python interpreter, console, editor, and the SL4A Library for Android. It’s Python on Android!
75

6+
## 设置开发环境
87

9-
QPython has several millions users in the world already, it's a great project for programming users, welcome to join us for contributing to this project NOW.
8+
git clone ...
9+
git submodule init
10+
git submodule sync
1011

1112

12-
What's NEW
13-
------------------------
14-
QPython project include the QPython https://play.google.com/store/apps/details?id=org.qpython.qpy and QPython3 https://play.google.com/store/apps/details?id=org.qpython.qpy3 applications.
13+
## 依赖submodule
1514

16-
QPython application is using the **Python 2.7.2** , and QPython3 application is using the **Python 3.2.2** .
15+
- https://github.com/QUSEIT/qbaselib (需要切换到QPY2分支)
16+
- https://github.com/QUSEIT/qftplib
1717

18+
## 开发IDE
1819

19-
QPython's newest version is 1.3.0 (Released on 2017/3/20) , QPython3's newest version is 1.0.2 (Released on 2017/3/29), New versions include many amazing features, please upgrade to the newest version as soon from google play, amazon appstore etc.
20+
- AndroidStudio for MacOSX 3.1.3
2021

2122

22-
Thanks these guys who are contributing
23-
----------------------------------------
24-
They are pushing on the QPython project moving forward.
23+
## 目录说明
2524

26-
River, Mae, Zoom.Quiet, MathiasLuo, liyuanrui, Kyle kersey ...
25+
- utils (代码管理相关小工具)
2726

27+
## FAQ
2828

29-
Do you want to join the great QPython team ? You could Ask qustions on twitter https://twitter.com/qpython or email us mailto:[email protected].
30-
And you could fork us on github https://github.com/qpython-android/qpython and send pull request.
31-
32-
33-
QPython Communities
34-
----------------------
35-
**There are many active QPython communities where you could meet the QPython users like you**
36-
37-
* Join Facebook community https://www.facebook.com/groups/qpython
38-
* Join Google group https://groups.google.com/forum/#!forum/qpython
39-
* Join Gitter chat https://gitter.im/qpython-android/qpython
40-
* Join G+ community https://plus.google.com/communities/111759148772865961493
41-
* QPython on Stackoverflow http://stackoverflow.com/questions/tagged/qpython
42-
43-
**And you could talk to us through social network**
44-
45-
* Like us on facebook https://www.facebook.com/QPython
46-
* Follow us on twitter https://twitter.com/qpython
47-
48-
* Report issue https://github.com/qpython-android/qpython/issues
49-
* Email us mailto:[email protected]
50-
51-
52-
Support
53-
-------------
54-
We are happy to hear feedback from you, but sometimes some bugs or features demand may not be implemented soon for we lack resources.
55-
56-
So if you have any issue need the core developer team to solve with higher priority, you could try the https://www.bountysource.com .
57-
58-
**It's the official QPython Users & Contributors' Guide, please follow http://www.qpython.org for more information.**
29+
[Android NDK编译错误解决](https://ivonhoe.github.io/2018/06/05/ndk17-build-error/)

build.gradle

Lines changed: 79 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,118 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1+
def supportVersion = "28.0.0" // equals to line60
2+
def retrofitVersion = "2.1.0"
3+
def rxVersion = "1.2.1"
4+
5+
def okhttpVersion = '3.10.0'
26

3-
//task wrapper(type: Wrapper) {
4-
// ersion = '2.2.1'
5-
// gradleV
6-
// distributionUrl = 'https://services.gradle.org/distributions/gradle-2.2.1-all.zip'
7-
//}
7+
def butterknifeVersion = '9.0.0' //eqals to line 26
88

99
buildscript {
1010
repositories {
1111
jcenter()
12-
mavenCentral()
1312
google()
13+
mavenCentral()
14+
15+
maven { url "https://plugins.gradle.org/m2/" }
16+
maven { url "https://maven.google.com" }
1417
}
18+
1519
dependencies {
16-
classpath 'com.android.tools.build:gradle:3.0.1'
17-
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
18-
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
19-
classpath "io.realm:realm-gradle-plugin:1.1.1"
20-
classpath 'com.jakewharton:butterknife-gradle-plugin:8.5.1'
21-
classpath "io.realm:realm-gradle-plugin:3.0.0"
20+
classpath 'com.android.tools.build:gradle:3.5.3'
21+
22+
// A gradle plugin for getting java lambda support in java 6, 7 and android
23+
// https://github.com/evant/gradle-retrolambda
24+
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
25+
26+
// Gradle plugin which downloads and manages your Android SDK.
27+
//classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
28+
29+
// Field and method binding for Android views which uses annotation processing to generate boilerplate code for you.
30+
// https://github.com/JakeWharton/butterknife
31+
classpath "com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2"
32+
33+
// Realm is a mobile database: a replacement for SQLite & ORMs
34+
// https://github.com/realm/realm-java
35+
classpath "io.realm:realm-gradle-plugin:3.5.0"
36+
37+
classpath 'com.google.gms:google-services:4.0.2'
2238
}
2339
}
2440

2541
allprojects {
2642
repositories {
2743
jcenter()
44+
google()
45+
46+
mavenCentral()
2847
maven { url "https://jitpack.io" }
2948
maven { url 'https://dl.bintray.com/azeesoft/maven' }
30-
google()
49+
//maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }
3150
}
3251
}
3352

3453
task clean(type: Delete) {
3554
delete rootProject.buildDir
3655
}
3756

38-
3957
subprojects {
4058
def androidHome
41-
4259
if ((androidHome = System.env.'ANDROID_HOME')
4360
&& (androidHome = androidHome as File).exists()
44-
&& androidHome.canWrite())
45-
apply plugin: 'android-sdk-manager'
46-
}
61+
&& androidHome.canWrite()) {
62+
//apply plugin: 'android-sdk-manager'
63+
}
4764

65+
project.configurations.all {
66+
resolutionStrategy.eachDependency { details ->
67+
if (details.requested.group == 'com.android.support'
68+
&& !details.requested.name.contains('multidex')) {
69+
details.useVersion "${supportVersion}"
70+
}
71+
}
4872

49-
def supportVersion = "26.0.2"
50-
def rxVersion = "1.2.1"
73+
}
74+
}
5175

5276
ext {
53-
minSdkVersion = 15
54-
targetSdkVersion = 26
55-
compileSdkVersion = 26
56-
buildToolsVersion = '26.0.2'
77+
libOkHttp3 = "com.squareup.okhttp3:okhttp:${okhttpVersion}"
78+
79+
libRxJava = "io.reactivex:rxandroid:${rxVersion}"
80+
libRxAndroid = "io.reactivex:rxjava:${rxVersion}"
81+
libFileDownloaderLib = 'com.liulishuo.filedownloader:library:0.3.5'
5782

58-
libSupportV7 = "com.android.support:appcompat-v7:${supportVersion}"
5983
libSupportV4 = "com.android.support:support-v4:${supportVersion}"
60-
libSupportAnnotation = "com.android.support:support-annotations:${supportVersion}"
84+
libSupportV4Design = 'com.android.support:design:${supportVersion}'
85+
86+
libSupportV7 = "com.android.support:appcompat-v7:${supportVersion}"
6187
libSupportCardView = "com.android.support:cardview-v7:${supportVersion}"
6288

89+
libSupportPreference = "com.android.support:preference-v14:${supportVersion}"
90+
libSupportAnnotation = "com.android.support:support-annotations:${supportVersion}"
6391
libSupportDesign = "com.android.support:design:${supportVersion}"
64-
libGuava = "com.google.guava:guava:18.0"
65-
libOkHttp3 = "com.squareup.okhttp3:okhttp:3.4.0"
92+
libOkHttp3Log = "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
6693

67-
libRxJava = "io.reactivex:rxandroid:${rxVersion}"
68-
libRxAndroid = "io.reactivex:rxjava:${rxVersion}"
94+
minSdkVersion = 14
95+
targetSdkVersion = 28
96+
compileSdkVersion = 28
97+
buildToolsVersion = '28.0.3'
6998

99+
// firebase related https://firebase.google.com/docs/android/setup
100+
firebaseCore = "com.google.firebase:firebase-core:16.0.6"
101+
firebaseMsg = "com.google.firebase:firebase-messaging:17.3.4"
102+
firebaseAuth = "com.google.firebase:firebase-auth:16.1.0"
103+
firebaseDatabase = "com.google.firebase:firebase-database:16.0.5"
70104

71-
}
105+
// https://developers.google.com/android/guides/setup
106+
googlePlayServiceAuth = "com.google.android.gms:play-services-auth:16.0.1"
107+
108+
leakcanaryDebug = 'com.squareup.leakcanary:leakcanary-android:1.5.4'
109+
leakcanaryRelease = 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
110+
libGoogleGuava = 'com.google.guava:guava:18.0'
111+
112+
retrofit = "com.squareup.retrofit2:retrofit:${retrofitVersion}"
113+
retrofitCoverterGson = "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
114+
retrofitAdapterRxjava = "com.squareup.retrofit2:adapter-rxjava:${retrofitVersion}"
115+
116+
libButterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
117+
libButterknifeCompiler ="com.jakewharton:butterknife-compiler:${butterknifeVersion}"
118+
}

debug.keystore

1.23 KB
Binary file not shown.

git-console-kotlin/GitTestProject/src/GitTest.kt

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

git-console-kotlin/GitTestProject/src/Main.kt

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

git-console-kotlin/README.md

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

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +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
1817
org.gradle.daemon=true
19-
android.enableAapt2=false
18+
android.debug.obsoleteApi=true
19+
#android.useDeprecatedNdk=true

gradle/wrapper/gradle-wrapper.jar

52.4 KB
Binary file not shown.

gradlew

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ fi
107107

108108
# For Cygwin, switch paths to Windows format before running java
109109
if $cygwin ; then
110-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
110+
APP_HOME=`cygpath --mPath --mixed "$APP_HOME"`
111+
CLASSPATH=`cygpath --mPath --mixed "$CLASSPATH"`
112112
JAVACMD=`cygpath --unix "$JAVACMD"`
113113

114114
# We build the pattern for arguments to be converted via cygpath
@@ -130,7 +130,7 @@ if $cygwin ; then
130130
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
131131

132132
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
133-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
133+
eval `echo args$i`=`cygpath --mPath --ignore --mixed "$arg"`
134134
else
135135
eval `echo args$i`="\"$arg\""
136136
fi

0 commit comments

Comments
 (0)