Skip to content

Commit 9211e0f

Browse files
committed
新增部分语法,UI优化
1 parent 0bc5234 commit 9211e0f

102 files changed

Lines changed: 14384 additions & 54617 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 1 addition & 1171 deletions
Large diffs are not rendered by default.

app/build.gradle

Lines changed: 12 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<<<<<<< HEAD
21
apply plugin: 'com.android.application'
32
android {
43
compileSdkVersion 30
54
defaultConfig {
65
applicationId "com.androlua"
7-
minSdkVersion 18
8-
targetSdkVersion 30
6+
minSdkVersion 19
7+
//noinspection ExpiredTargetSdkVersion
8+
targetSdkVersion 25
9+
multiDexEnabled false
910
ndk {
1011
ldLibs "log"
1112
android.ndkVersion "22.1.7171670"
1213
abiFilters 'arm64-v8a'
1314
}
1415
}
1516
packagingOptions {
16-
exclude 'META-INF/proguard/androidx-annotations.pro'
1717
exclude 'META-INF/NOTICE'
1818
exclude 'META-INF/LICENSE'
1919
exclude 'META-INF/LICENSE.txt'
@@ -23,17 +23,18 @@ android {
2323
release {
2424
minifyEnabled false
2525
debuggable false
26-
multiDexEnabled true
26+
multiDexEnabled false
2727
}
2828
debug {
29+
minifyEnabled false
2930
debuggable true
3031
jniDebuggable true
3132
}
3233

3334
}
3435
externalNativeBuild {
3536
ndkBuild {
36-
path 'src/main/jni/android.mk'
37+
path 'src/main/jni/Android.mk'
3738
}
3839
}
3940
productFlavors {
@@ -48,55 +49,9 @@ android {
4849
dependencies {
4950
implementation fileTree(dir: 'libs', include: ['*.jar'])
5051
implementation 'androidx.annotation:annotation:1.4.0'
51-
=======
52-
apply plugin: 'com.android.application'
53-
android {
54-
compileSdkVersion 30
55-
defaultConfig {
56-
applicationId "com.androlua"
57-
minSdkVersion 18
58-
targetSdkVersion 30
59-
ndk {
60-
ldLibs "log"
61-
android.ndkVersion "22.1.7171670"
62-
abiFilters 'arm64-v8a'
63-
}
64-
}
65-
packagingOptions {
66-
exclude 'META-INF/proguard/androidx-annotations.pro'
67-
exclude 'META-INF/NOTICE'
68-
exclude 'META-INF/LICENSE'
69-
exclude 'META-INF/LICENSE.txt'
70-
exclude 'META-INF/NOTICE.txt'
71-
}
72-
buildTypes {
73-
release {
74-
minifyEnabled false
75-
debuggable false
76-
multiDexEnabled true
77-
}
78-
debug {
79-
debuggable true
80-
jniDebuggable true
81-
}
82-
83-
}
84-
externalNativeBuild {
85-
ndkBuild {
86-
path 'src/main/jni/android.mk'
87-
}
88-
}
89-
productFlavors {
90-
}
91-
compileOptions {
92-
targetCompatibility JavaVersion.VERSION_11
93-
sourceCompatibility JavaVersion.VERSION_11
94-
}
95-
ndkVersion '25.0.8775105'
96-
}
97-
98-
dependencies {
99-
implementation fileTree(dir: 'libs', include: ['*.jar'])
100-
implementation 'androidx.annotation:annotation:1.4.0'
101-
>>>>>>> d5ebc43 (Lua 5.5.0)
52+
implementation 'androidx.core:core:1.6.0'
53+
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
54+
implementation 'cn.wanghaomiao:JsoupXpath:2.5.1'
55+
implementation 'org.apache.commons:commons-compress:1.21'
56+
implementation 'commons-io:commons-io:2.5'
10257
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.androlua"
5-
android:versionCode="5404"
6-
android:versionName="5.4.4">
5+
android:versionCode="5500"
6+
android:versionName="5.5.0">
77
<uses-sdk
88
android:minSdkVersion="19"
99
android:targetSdkVersion="23"/>

0 commit comments

Comments
 (0)