tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update libraries and dependencies's version

Browse Source
This commit is contained in:
hyb1996
2018-10-06 10:12:29 +08:00
parent 9d1fdf3fe9
commit 4851790ad9
20 changed files with 155 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
app/build.gradle
View File

@@ -1,15 +1,23 @@
apply plugin: 'com.android.application'
def AAVersion = '4.3.1'
def AAVersion = '4.4.0'
def SupportLibVersion = '28.0.0'
configurations.all {
resolutionStrategy {
force "com.android.support:appcompat-v7:${SupportLibVersion}"
force "com.android.support:support-v4:${SupportLibVersion}"
}
}
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion versions.compile
buildToolsVersion versions.buildTool
defaultConfig {
applicationId "org.autojs.autojs"
minSdkVersion 17
targetSdkVersion 23
versionCode 421
versionName "4.0.3 Alpha2"
minSdkVersion versions.mini
targetSdkVersion versions.target
versionCode 423
versionName "4.0.3 Alpha4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk {
@@ -24,7 +32,7 @@ android {
}
release {
shrinkResources false
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@@ -70,83 +78,83 @@ repositories {
}
dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
// Android Annotations
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"
implementation "org.androidannotations:androidannotations-api:$AAVersion"
// ButterKnife
compile('com.jakewharton:butterknife:8.6.0', {
implementation('com.jakewharton:butterknife:8.8.1', {
exclude group: 'com.android.support'
})
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
// Android supports
compile 'com.android.support:appcompat-v7:27.1.1'
compile 'com.android.support:cardview-v7:27.1.1'
compile 'com.android.support:design:27.1.1'
compile 'com.android.support:multidex:1.0.3'
implementation "com.android.support:appcompat-v7:${SupportLibVersion}"
implementation "com.android.support:cardview-v7:${SupportLibVersion}"
implementation "com.android.support:design:${SupportLibVersion}"
implementation 'com.android.support:multidex:1.0.3'
// Personal libraries
compile 'com.github.hyb1996:MutableTheme:0.2.2'
implementation 'com.github.hyb1996:MutableTheme:0.2.2'
// Material Dialogs
compile('com.afollestad.material-dialogs:core:0.9.2.3', {
implementation('com.afollestad.material-dialogs:core:0.9.2.3', {
exclude group: 'com.android.support'
})
// Common Markdown
compile 'com.github.atlassian:commonmark-java:commonmark-parent-0.9.0'
implementation 'com.github.atlassian:commonmark-java:commonmark-parent-0.9.0'
// Android issue reporter (a github issue reporter)
compile('com.heinrichreimersoftware:android-issue-reporter:1.3.1', {
implementation('com.heinrichreimersoftware:android-issue-reporter:1.3.1', {
exclude group: 'com.afollestad.material-dialogs'
exclude group: 'com.android.support'
})
//MultiLevelListView
compile 'com.github.hyb1996:android-multi-level-listview:1.1'
implementation 'com.github.hyb1996:android-multi-level-listview:1.1'
//Licenses Dialog
compile 'de.psdev.licensesdialog:licensesdialog:1.8.1'
implementation 'de.psdev.licensesdialog:licensesdialog:1.8.1'
//Expandable RecyclerView
compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
//FlexibleDivider
compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0'
//???
compile 'com.wang.avi:library:2.1.3'
implementation 'com.wang.avi:library:2.1.3'
//Commons-lang
compile 'org.apache.commons:commons-lang3:3.6'
implementation 'org.apache.commons:commons-lang3:3.6'
//Expandable RecyclerView
compile 'com.thoughtbot:expandablerecyclerview:1.3'
compile('com.github.hyb1996:FloatingCircularActionMenu:0.0.4')
compile 'com.github.hyb1996:Auto.js-ApkBuilder:1.0.1'
implementation 'com.thoughtbot:expandablerecyclerview:1.3'
implementation('com.github.hyb1996:FloatingCircularActionMenu:0.0.4')
implementation 'com.github.hyb1996:Auto.js-ApkBuilder:1.0.1'
// RxJava
compile "io.reactivex.rxjava2:rxjava:2.1.2"
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation "io.reactivex.rxjava2:rxjava:2.1.2"
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
// Retrofit
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
//Glide
compile('com.github.bumptech.glide:glide:4.2.0', {
implementation('com.github.bumptech.glide:glide:4.8.0', {
exclude group: 'com.android.support'
})
annotationProcessor 'com.github.bumptech.glide:compiler:4.2.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
//joda time
compile 'joda-time:joda-time:2.9.9'
implementation 'joda-time:joda-time:2.9.9'
// Tasker Plugin
compile 'com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.3'
implementation 'com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.3'
// Flurry
compile 'com.flurry.android:analytics:7.0.0@aar'
implementation 'com.flurry.android:analytics:7.0.0@aar'
// Bugly
compile 'com.tencent.bugly:crashreport:2.6.6'
implementation 'com.tencent.bugly:crashreport:2.6.6'
// MaterialDialogCommon
compile('com.afollestad.material-dialogs:commons:0.9.2.3', {
implementation('com.afollestad.material-dialogs:commons:0.9.2.3', {
exclude group: 'com.android.support'
})
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
// Optional, if you use support library fragments:
debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.1'
compile project(':automator')
compile project(':common')
compile project(':autojs')
implementation project(':automator')
implementation project(':common')
implementation project(':autojs')
implementation (name: 'ads8', ext: 'aar')
}

5
app/src/main/AndroidManifest.xml
View File

@@ -23,6 +23,7 @@
<!-- Ad SDK Permissions -->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<application
xmlns:tools="http://schemas.android.com/tools"
android:name=".App"
@@ -34,6 +35,10 @@
android:theme="@style/AppTheme"
tools:replace="android:label, android:icon, android:allowBackup">
<meta-data
android:name="android.max_aspect"
android:value="2.1" />
<activity
android:name=".ui.splash.SplashActivity"
android:hardwareAccelerated="true"

3
app/src/main/java/org/autojs/autojs/model/explorer/ExplorerFileItem.java
View File

@@ -1,6 +1,7 @@
package org.autojs.autojs.model.explorer;
import com.stardust.pio.PFile;
import com.stardust.util.ObjectHelper;
import org.autojs.autojs.model.script.ScriptFile;
@@ -9,6 +10,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
public class ExplorerFileItem implements ExplorerItem {
private static final Set<String> sEditableFileExts = new HashSet<>(Arrays.asList(
@@ -19,6 +21,7 @@ public class ExplorerFileItem implements ExplorerItem {
private final ExplorerPage mParent;
public ExplorerFileItem(PFile file, ExplorerPage parent) {
ObjectHelper.requireNonNull(file, "file");
mFile = file;
mParent = parent;
}

5
app/src/main/java/org/autojs/autojs/pluginclient/JsonWebSocket.java
View File

@@ -8,11 +8,7 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringReader;
import java.net.Socket;
import javax.annotation.Nullable;
@@ -23,7 +19,6 @@ import okhttp3.Request;
import okhttp3.Response;
import okhttp3.WebSocket;
import okhttp3.WebSocketListener;
import okio.ByteString;
public class JsonWebSocket extends WebSocketListener {

1
app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java
View File

@@ -6,7 +6,6 @@ import android.support.annotation.StringRes;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.pio.PFile;
import com.tencent.bugly.crashreport.BuglyLog;
import org.autojs.autojs.R;
import org.autojs.autojs.model.explorer.Explorer;

2
app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
View File

@@ -176,6 +176,8 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
}
private void setUpViewPagerFragmentBehaviors() {
mPagerAdapter.setOnFragmentInstantiateListener((pos, fragment) -> {
((ViewPagerFragment) fragment).setFab(mFab);
if (pos == mViewPager.getCurrentItem()) {

2
app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
View File

@@ -239,9 +239,9 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
SettingsActivity.selectThemeColor(getActivity());
}
@SuppressLint("CheckResult")
private void enableAccessibilityServiceByRootIfNeeded() {
Observable.fromCallable(() -> Pref.shouldEnableAccessibilityServiceByRoot() && !isAccessibilityServiceEnabled())
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(needed -> {
if (needed) {